Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Memory leak of airport tile layout in AirportChangeInfo (prop 0A) (#8928)

Browse Source
This commit is contained in:
Jonathan G Rennison 2021-04-02 09:13:53 +01:00 committed by GitHub
parent adb9fa3b36
commit 83ac5aa27a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/newgrf.cpp
View File

@ -3862,6 +3862,7 @@ static ChangeInfoResult AirportChangeInfo(uint airport, int numinfo, int prop, B
} }
case 0x0A: { // Set airport layout case 0x0A: { // Set airport layout
byte old_num_table = as->num_table;
free(as->rotation); free(as->rotation);
as->num_table = buf->ReadByte(); // Number of layaouts as->num_table = buf->ReadByte(); // Number of layaouts
as->rotation = MallocT<Direction>(as->num_table); as->rotation = MallocT<Direction>(as->num_table);
@ -3920,6 +3921,12 @@ static ChangeInfoResult AirportChangeInfo(uint airport, int numinfo, int prop, B
tile_table[j] = CallocT<AirportTileTable>(size); tile_table[j] = CallocT<AirportTileTable>(size);
memcpy(tile_table[j], copy_from, sizeof(*copy_from) * size); memcpy(tile_table[j], copy_from, sizeof(*copy_from) * size);
} }
/* Free old layouts in the airport spec */
for (int j = 0; j < old_num_table; j++) {
/* remove the individual layouts */
free(as->table[j]);
}
free(as->table);
/* Install final layout construction in the airport spec */ /* Install final layout construction in the airport spec */
as->table = tile_table; as->table = tile_table;
free(att); free(att);