TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

egg: Fix egg lexer hanging on unterminated quote or C-style comment

Browse Source
This commit is contained in:
rdb 2021-01-02 18:43:10 +01:00
parent 748dd61615
commit 5d5efb75e8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/egg/lexer.cxx.prebuilt
View File

@ -1195,12 +1195,12 @@ scan_quoted_string() {
int c;
c = read_char(line, col);
while (c != '"' && c != EOF) {
while (c != '"' && c != 0 && c != EOF) {
result += c;
c = read_char(line, col);
}
if (c == EOF) {
if (c == 0 || c == EOF) {
eggyyerror("This quotation mark is unterminated.");
}
@ -1224,7 +1224,7 @@ eat_c_comment() {
last_c = '\0';
c = read_char(line, col);
while (c != EOF && !(last_c == '*' && c == '/')) {
while (c != 0 && c != EOF && !(last_c == '*' && c == '/')) {
if (last_c == '/' && c == '*') {
std::ostringstream errmsg;
errmsg << "This comment contains a nested /* symbol at line "
@ -1236,7 +1236,7 @@ eat_c_comment() {
c = read_char(line, col);
}
if (c == EOF) {
if (c == 0 || c == EOF) {
eggyyerror("This comment marker is unclosed.");
}

8
panda/src/egg/lexer.lxx
View File

@ -250,12 +250,12 @@ scan_quoted_string() {
int c;
c = read_char(line, col);
while (c != '"' && c != EOF) {
while (c != '"' && c != 0 && c != EOF) {
result += c;
c = read_char(line, col);
}
if (c == EOF) {
if (c == 0 || c == EOF) {
eggyyerror("This quotation mark is unterminated.");
}
@ -279,7 +279,7 @@ eat_c_comment() {
last_c = '\0';
c = read_char(line, col);
while (c != EOF && !(last_c == '*' && c == '/')) {
while (c != 0 && c != EOF && !(last_c == '*' && c == '/')) {
if (last_c == '/' && c == '*') {
std::ostringstream errmsg;
errmsg << "This comment contains a nested /* symbol at line "
@ -291,7 +291,7 @@ eat_c_comment() {
c = read_char(line, col);
}
if (c == EOF) {
if (c == 0 || c == EOF) {
eggyyerror("This comment marker is unclosed.");
}