dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saveload: De-duplicate handling of wrong length SLXI extra data

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-09-30 16:44:01 +01:00
parent df4c458c29
commit e0e4d7c07e
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sl/extended_ver_sl.cpp
View File

@@ -711,6 +711,12 @@ static void Load_SLXI()
} }
} }
static void IgnoreWrongLengthExtraData(const SlxiSubChunkInfo *info, uint32 length)
{
DEBUG(sl, 1, "SLXI chunk: feature: '%s', version: %d, has data of wrong length: %u", info->name, _sl_xv_feature_versions[info->index], length);
ReadBuffer::GetCurrent()->SkipBytes(length);
}
static void loadVL(const SlxiSubChunkInfo *info, uint32 length) static void loadVL(const SlxiSubChunkInfo *info, uint32 length)
{ {
_sl_xv_version_label.resize(length); _sl_xv_version_label.resize(length);
@@ -731,8 +737,7 @@ static void loadUV(const SlxiSubChunkInfo *info, uint32 length)
_sl_xv_upstream_version = (SaveLoadVersion)SlReadUint16(); _sl_xv_upstream_version = (SaveLoadVersion)SlReadUint16();
DEBUG(sl, 2, "SLXI upstream version: %u", _sl_xv_upstream_version); DEBUG(sl, 2, "SLXI upstream version: %u", _sl_xv_upstream_version);
} else { } else {
DEBUG(sl, 1, "SLXI chunk: feature: '%s', version: %d, has data of wrong length: %u", info->name, _sl_xv_feature_versions[info->index], length); IgnoreWrongLengthExtraData(info, length);
ReadBuffer::GetCurrent()->SkipBytes(length);
} }
} }
@@ -747,8 +752,7 @@ static void loadLC(const SlxiSubChunkInfo *info, uint32 length)
if (length == 1) { if (length == 1) {
_loaded_local_company = (CompanyID) ReadBuffer::GetCurrent()->ReadByte(); _loaded_local_company = (CompanyID) ReadBuffer::GetCurrent()->ReadByte();
} else { } else {
DEBUG(sl, 1, "SLXI chunk: feature: '%s', version: %d, has data of wrong length: %u", info->name, _sl_xv_feature_versions[info->index], length); IgnoreWrongLengthExtraData(info, length);
ReadBuffer::GetCurrent()->SkipBytes(length);
} }
} }
@@ -764,8 +768,7 @@ static void loadSTC(const SlxiSubChunkInfo *info, uint32 length)
if (length == 8) { if (length == 8) {
_station_tile_cache_hash = SlReadUint64(); _station_tile_cache_hash = SlReadUint64();
} else { } else {
DEBUG(sl, 1, "SLXI chunk: feature: '%s', version: %d, has data of wrong length: %u", info->name, _sl_xv_feature_versions[info->index], length); IgnoreWrongLengthExtraData(info, length);
ReadBuffer::GetCurrent()->SkipBytes(length);
} }
} }