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

Fix AirportSpec->rotation not being duplicated/freed correctly

Browse Source 
Fixes crashes when resetting GRF data
This commit is contained in:
Jonathan G Rennison
2017-10-12 01:50:28 +01:00
parent 5282394b04
commit 86a9438070
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf.cpp
View File

@@ -3680,6 +3680,9 @@ static void DuplicateTileTable(AirportSpec *as)
MemCpyT(depot_table, as->depot_table, as->nof_depots); MemCpyT(depot_table, as->depot_table, as->nof_depots);
} }
as->depot_table = depot_table; as->depot_table = depot_table;
Direction *rotation = MallocT<Direction>(as->num_table);
MemCpyT(rotation, as->rotation, as->num_table);
as->rotation = rotation;
} }
/** /**
@@ -3750,6 +3753,7 @@ static ChangeInfoResult AirportChangeInfo(uint airport, int numinfo, int prop, B
case 0x0A: { // Set airport layout case 0x0A: { // Set airport layout
as->num_table = buf->ReadByte(); // Number of layaouts as->num_table = buf->ReadByte(); // Number of layaouts
free(as->rotation);
as->rotation = MallocT<Direction>(as->num_table); as->rotation = MallocT<Direction>(as->num_table);
uint32 defsize = buf->ReadDWord(); // Total size of the definition uint32 defsize = buf->ReadDWord(); // Total size of the definition
AirportTileTable **tile_table = CallocT<AirportTileTable*>(as->num_table); // Table with tiles to compose the airport AirportTileTable **tile_table = CallocT<AirportTileTable*>(as->num_table); // Table with tiles to compose the airport