gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r26062) -Fix: beef up checks against invalid data in highscore and language files

Browse Source
This commit is contained in:
rubidium 2013-11-23 13:18:29 +00:00
parent 78a316d349
commit 3b2a92ea97
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/highscore.cpp
View File

@ -165,7 +165,7 @@ void LoadFromHighScore()
for (hs = _highscore_table[i]; hs != endof(_highscore_table[i]); hs++) { for (hs = _highscore_table[i]; hs != endof(_highscore_table[i]); hs++) {
byte length; byte length;
if (fread(&length, sizeof(length), 1, fp) != 1 || if (fread(&length, sizeof(length), 1, fp) != 1 ||
fread(hs->company, length, 1, fp) > 1 || // Yes... could be 0 bytes too fread(hs->company, min<int>(lengthof(hs->company), length), 1, fp) > 1 || // Yes... could be 0 bytes too
fread(&hs->score, sizeof(hs->score), 1, fp) != 1 || fread(&hs->score, sizeof(hs->score), 1, fp) != 1 ||
fseek(fp, 2, SEEK_CUR) == -1) { // XXX - placeholder for hs->title, not saved anymore; compatibility fseek(fp, 2, SEEK_CUR) == -1) { // XXX - placeholder for hs->title, not saved anymore; compatibility
DEBUG(misc, 1, "Highscore corrupted"); DEBUG(misc, 1, "Highscore corrupted");

7
src/strings.cpp
View File

@ -1763,7 +1763,12 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
uint count = 0; uint count = 0;
for (uint i = 0; i < TAB_COUNT; i++) { for (uint i = 0; i < TAB_COUNT; i++) {
uint num = lang_pack->offsets[i]; uint16 num = lang_pack->offsets[i];
if (num > TAB_SIZE) {
free(lang_pack);
return false;
}
_langtab_start[i] = count; _langtab_start[i] = count;
_langtab_num[i] = num; _langtab_num[i] = num;
count += num; count += num;