gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-05-14 13:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for a SDAS "Def" or "Ref" line before reading a subsequent integer

Browse Source 
Without checking `token[0]` through `token[2], `readInt` starting at
`&token[3]` could go out of bounds on a badly-formed SDAS .rel object file
This commit is contained in:
Rangi
2026-03-30 19:45:44 -04:00
parent 92a31ff7df
commit efd4373a56
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/link/sdas_obj.cpp
+8 -7
View File
@@ -381,6 +381,12 @@ void sdobj_ReadFile(FileStackNode const &src, FILE *file, std::vector<Symbol> &f
expectNext(nullptr, 'S'); expectNext(nullptr, 'S');
// Expected format: /[DR]ef[0-9A-F]+/i
if ((token[0] != 'D' && token[0] != 'd' && token[0] != 'R' && token[0] != 'r')
|| token[1] != 'e' || token[2] != 'f') {
fatalAt(where, "'S' line is neither \"Def\" nor \"Ref\"");
}
if (int32_t value = readInt(where, &token[3], numberBase); !fileSections.empty()) { if (int32_t value = readInt(where, &token[3], numberBase); !fileSections.empty()) {
// Symbols in sections are labels; their value is an offset // Symbols in sections are labels; their value is an offset
Section *section = fileSections.back().section.get(); Section *section = fileSections.back().section.get();
@@ -395,15 +401,13 @@ void sdobj_ReadFile(FileStackNode const &src, FILE *file, std::vector<Symbol> &f
symbol.data = value; symbol.data = value;
} }
// Expected format: /[DR]ef[0-9A-F]+/i
if (token[0] == 'R' || token[0] == 'r') { if (token[0] == 'R' || token[0] == 'r') {
// "Ref" symbols are imported
symbol.type = SYMTYPE_IMPORT; symbol.type = SYMTYPE_IMPORT;
sym_AddSymbol(symbol); sym_AddSymbol(symbol);
// TODO: hard error if the rest is not zero // TODO: hard error if the rest is not zero
} else if (token[0] != 'D' && token[0] != 'd') {
fatalAt(where, "'S' line is neither \"Def\" nor \"Ref\"");
} else { } else {
// All symbols are exported // "Def" symbols are exported
symbol.type = SYMTYPE_EXPORT; symbol.type = SYMTYPE_EXPORT;
Symbol const *other = sym_GetSymbol(symbol.name); Symbol const *other = sym_GetSymbol(symbol.name);
@@ -440,9 +444,6 @@ void sdobj_ReadFile(FileStackNode const &src, FILE *file, std::vector<Symbol> &f
// It's fine to keep modifying the symbol after `AddSymbol`, only // It's fine to keep modifying the symbol after `AddSymbol`, only
// the name must not be modified // the name must not be modified
} }
if (strncasecmp(&token[1], "ef", literal_strlen("ef")) != 0) {
fatalAt(where, "'S' line is neither \"Def\" nor \"Ref\"");
}
if (!fileSections.empty()) { if (!fileSections.empty()) {
fileSections.back().section->symbols.push_back(&symbol); fileSections.back().section->symbols.push_back(&symbol);