mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Bounds check access to railtype_map. (#7529)

pull/7531/head
PeterN 2019-04-20 02:34:25 +01:00 committed by GitHub
parent d2b6176cdf
commit be073b46da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf.cpp
View File

@ -5478,7 +5478,8 @@ static void RailTypeMapSpriteGroup(ByteReader *buf, uint8 idcount)
{ {
uint8 *railtypes = AllocaM(uint8, idcount); uint8 *railtypes = AllocaM(uint8, idcount);
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
railtypes[i] = _cur.grffile->railtype_map[buf->ReadByte()]; uint8 id = buf->ReadByte();
railtypes[i] = id < RAILTYPE_END ? _cur.grffile->railtype_map[id] : INVALID_RAILTYPE;
} }
uint8 cidcount = buf->ReadByte(); uint8 cidcount = buf->ReadByte();