Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix segfaults at EOF for scan_includes, and add token/newline checks (#1068)

This commit is contained in:
Lorenzooone 2023-08-14 18:12:00 +02:00 committed by GitHub
parent e07a1e7773
commit 8e71632536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tools/scan_includes.c
View File

@ -42,29 +42,48 @@ void scan_file(const char *filename, bool strict) {
for (char *ptr = contents; ptr && ptr - contents < size; ptr++) { for (char *ptr = contents; ptr && ptr - contents < size; ptr++) {
bool is_incbin = false, is_include = false; bool is_incbin = false, is_include = false;
ptr = strpbrk(ptr, ";\"Ii");
if (!ptr) {
break;
}
switch (*ptr) { switch (*ptr) {
case ';': case ';':
ptr = strchr(ptr, '\n'); // Skip comments until the end of the line
ptr = strchr(ptr + 1, '\n');
if (!ptr) { if (!ptr) {
fprintf(stderr, "%s: no newline at end of file\n", filename); fprintf(stderr, "%s: no newline at end of file\n", filename);
goto done;
} }
break; break;
case '"': case '"':
ptr++; // Skip string iteral until the closing quote
ptr = strchr(ptr, '"'); ptr = strchr(ptr + 1, '"');
if (ptr) { if (ptr) {
ptr++; ptr++;
} else { } else {
fprintf(stderr, "%s: unterminated string\n", filename); fprintf(stderr, "%s: unterminated string\n", filename);
goto done;
} }
break; break;
case 'I': case 'I':
case 'i': case 'i':
/* empty statement between the label and the variable declaration */;
// Check that an INCLUDE/INCBIN starts as its own token
char before = ptr > contents ? *(ptr - 1) : '\n';
if (before != ' ' && before != '\t' && before != '\n' && before != ':') {
break;
}
is_incbin = !strncmp(ptr, "INCBIN", 6) || !strncmp(ptr, "incbin", 6); is_incbin = !strncmp(ptr, "INCBIN", 6) || !strncmp(ptr, "incbin", 6);
is_include = !strncmp(ptr, "INCLUDE", 7) || !strncmp(ptr, "include", 7); is_include = !strncmp(ptr, "INCLUDE", 7) || !strncmp(ptr, "include", 7);
if (is_incbin || is_include) { if (is_incbin || is_include) {
ptr = strchr(ptr, '"'); // Check that an INCLUDE/INCBIN ends as its own token
if (ptr) { ptr += is_include ? 7 : 6;
if (*ptr != ' ' && *ptr != '\t' && *ptr != '\n' && *ptr != '"') {
break;
}
ptr += strspn(ptr, " \t");
if (*ptr == '"') {
// Print the file path and recursively scan INCLUDEs
ptr++; ptr++;
char *include_path = ptr; char *include_path = ptr;
size_t length = strcspn(ptr, "\""); size_t length = strcspn(ptr, "\"");
@ -74,12 +93,19 @@ void scan_file(const char *filename, bool strict) {
if (is_include) { if (is_include) {
scan_file(include_path, strict); scan_file(include_path, strict);
} }
} else {
fprintf(stderr, "%s: no file path after INC%s\n", filename, is_include ? "LUDE" : "BIN");
// Continue to process a comment
if (*ptr == ';') {
ptr--;
}
} }
} }
break; break;
} }
} }
done:
free(contents); free(contents);
} }