diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2021-02-21 17:33:26 +0000 |
|---|---|---|
| committer | Charles Pigott <charlespigott@googlemail.com> | 2021-02-21 18:16:09 +0000 |
| commit | 8157af6d688f62c9aa0cbc561f84dc15936a8919 (patch) | |
| tree | a8dc10edbbf54fff3f0bb50804eb52d9839e0f50 /src/newgrf.cpp | |
| parent | 3af407340e53703d2ccf558112eb67438096add7 (diff) | |
| download | openttd-8157af6d688f62c9aa0cbc561f84dc15936a8919.tar.xz | |
Fix #8276: Crash when a NewGRF object's size was not set
Diffstat (limited to 'src/newgrf.cpp')
| -rw-r--r-- | src/newgrf.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index b854c2801..660da389c 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -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 |