gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-28 05:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #420 from dbrotz/disallow-null-char

Browse Source 
Reject input that contains null characters
This commit is contained in:
Eldred Habert
2019-09-22 02:43:06 +02:00
committed by GitHub
parent 4be81d9ffd c5e8e4ff83
commit 7b592eff8a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/asm/lexer.c
View File

@@ -269,6 +269,7 @@ YY_BUFFER_STATE yy_create_buffer(FILE *f)
/* Convert all line endings to LF and spaces */ /* Convert all line endings to LF and spaces */
char *mem = pBuffer->pBuffer; char *mem = pBuffer->pBuffer;
int32_t lineCount = 0;
while (*mem) { while (*mem) {
if ((mem[0] == '\\') && (mem[1] == '\"' || mem[1] == '\\')) { if ((mem[0] == '\\') && (mem[1] == '\"' || mem[1] == '\\')) {
@@ -279,15 +280,22 @@ YY_BUFFER_STATE yy_create_buffer(FILE *f)
|| ((mem[0] == '\r') && (mem[1] == '\n'))) { || ((mem[0] == '\r') && (mem[1] == '\n'))) {
*mem++ = ' '; *mem++ = ' ';
*mem++ = '\n'; *mem++ = '\n';
lineCount++;
/* LF and CR */ /* LF and CR */
} else if ((mem[0] == '\n') || (mem[0] == '\r')) { } else if ((mem[0] == '\n') || (mem[0] == '\r')) {
*mem++ = '\n'; *mem++ = '\n';
lineCount++;
} else { } else {
mem++; mem++;
} }
} }
} }
if (mem != pBuffer->pBuffer + size) {
nLineNo = lineCount + 1;
fatalerror("Found null character");
}
/* Remove comments */ /* Remove comments */
mem = pBuffer->pBuffer; mem = pBuffer->pBuffer;

4
test/asm/null-in-macro.out
View File

@@ -1,2 +1,2 @@
ERROR: null-in-macro.asm(1): ERROR: null-in-macro.asm(2):
Unterminated MACRO definition. Found null character