mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #8276: Crash when a NewGRF object's size was not set

This commit is contained in:
Charles Pigott 2021-02-21 17:33:26 +00:00
parent 3af407340e
commit 8157af6d68
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf.cpp
View File

@ -4053,6 +4053,7 @@ static ChangeInfoResult ObjectChangeInfo(uint id, int numinfo, int prop, ByteRea
if (*ospec == nullptr) {
*ospec = CallocT<ObjectSpec>(1);
(*ospec)->views = 1; // Default for NewGRFs that don't set it.
(*ospec)->size = 0x11; // Default for NewGRFs that manage to not set it (1x1)
}
/* Swap classid because we read it in BE. */
@ -4078,6 +4079,10 @@ static ChangeInfoResult ObjectChangeInfo(uint id, int numinfo, int prop, ByteRea
case 0x0C: // Size
spec->size = buf->ReadByte();
if ((spec->size & 0xF0) == 0 || (spec->size & 0x0F) == 0) {
grfmsg(1, "ObjectChangeInfo: Invalid object size requested (%u) for object id %u. Ignoring.", spec->size, id + i);
spec->size = 0x11; // 1x1
}
break;
case 0x0D: // Build cost multipler