eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UB when parsing encounter table

This commit is contained in:
Alexander Batalov 2022-10-29 18:14:49 +03:00
parent 2b63360b95
commit caa8b06d4f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/worldmap.cc
View File

@ -1397,7 +1397,17 @@ static int wmParseEncounterTableIndex(EncounterEntry* entry, char* string)
if (strstr(string, "special")) { if (strstr(string, "special")) {
entry->flags |= ENCOUNTER_ENTRY_SPECIAL; entry->flags |= ENCOUNTER_ENTRY_SPECIAL;
string += 8;
// CE: Original code unconditionally consumes 8 characters, which is
// right when "special" is followed by conditions (separated with
// comma). However when "special" is the last keyword (which I guess
// is wrong, but present in worldmap.txt), consuming 8 characters
// sets pointer past NULL terminator, which can lead to many bad
// things (UB).
string += 7;
if (*string != '\0') {
string++;
}
} }
if (string != NULL) { if (string != NULL) {