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

(svn r26070) -Fix: prevent extremely huge size for data (1+GiB)

Browse Source
This commit is contained in:
rubidium 2013-11-23 18:11:01 +00:00
parent cf130ce9d8
commit 1b9e32664f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/newgrf_config.cpp
View File

@ -335,7 +335,14 @@ size_t GRFGetSizeOfDataSection(FILE *f)
if (fread(data, 1, header_len, f) == header_len) {
if (data[0] == 0 && data[1] == 0 && MemCmpT(data + 2, _grf_cont_v2_sig, 8) == 0) {
/* Valid container version 2, get data section size. */
size_t offset = (data[13] << 24) | (data[12] << 16) | (data[11] << 8) | data[10];
size_t offset = ((size_t)data[13] << 24) | ((size_t)data[12] << 16) | ((size_t)data[11] << 8) | (size_t)data[10];
if (offset >= 1 * 1024 * 1024 * 1024) {
DEBUG(grf, 0, "Unexpectedly large offset for NewGRF");
/* Having more than 1 GiB of data is very implausible. Mostly because then
* all pools in OpenTTD are flooded already. Or it's just Action C all over.
* In any case, the offsets to graphics will likely not work either. */
return SIZE_MAX;
}
return header_len + offset;
}
}