gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RAW lexer length underflow

Browse Source 
Also added an assertion to check against more such overflows
This commit is contained in:
ISSOtm
2020-08-15 14:34:47 +02:00
parent d9ecaabac1
commit b27b821e7f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/asm/lexer.c
View File

@@ -792,6 +792,7 @@ nextExpansion:
/* Wrap around if necessary */ /* Wrap around if necessary */
if (lexerState->index >= LEXER_BUF_SIZE) if (lexerState->index >= LEXER_BUF_SIZE)
lexerState->index %= LEXER_BUF_SIZE; lexerState->index %= LEXER_BUF_SIZE;
assert(lexerState->nbChars >= distance);
lexerState->nbChars -= distance; lexerState->nbChars -= distance;
} }
} }
@@ -1467,9 +1468,7 @@ static int yylex_NORMAL(void)
case '8': case '8':
case '9': case '9':
readNumber(10, c - '0'); readNumber(10, c - '0');
int perhapsPeriod = peek(0); if (peek(0) == '.') {
if (perhapsPeriod == '.') {
shiftChars(1); shiftChars(1);
readFractionalPart(); readFractionalPart();
} }
@@ -1597,8 +1596,11 @@ static int yylex_RAW(void)
i--; i--;
/* Empty macro args break their expansion, so prevent that */ /* Empty macro args break their expansion, so prevent that */
if (i == 0) { if (i == 0) {
/* Return the EOF token, and don't shift a non-existent char! */
if (c == EOF)
return 0;
shiftChars(1); shiftChars(1);
return c == EOF ? 0 : c; return c;
} }
yylval.tzString[i] = '\0'; yylval.tzString[i] = '\0';
dbgPrint("Read raw string \"%s\"\n", yylval.tzString); dbgPrint("Read raw string \"%s\"\n", yylval.tzString);