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

Merge pull request #5814 from rwjuk/spriteguardnull 

Guard against NULL in fix_invalid_vehicle_sprite_sizes()
This commit is contained in:
Michał Janiszewski 2017-07-09 21:19:49 +02:00 committed by GitHub
parent cf1f907138 f89e56bbc4
commit 23882ae7a6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/ride/ride.c
View File

@ -8684,6 +8684,14 @@ void fix_invalid_vehicle_sprite_sizes()
while (rideSpriteIndex != SPRITE_INDEX_NULL) {
rct_vehicle *vehicle = GET_VEHICLE(rideSpriteIndex);
rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle);
if (vehicle == NULL ||
vehicleEntry == NULL ||
vehicleEntry == (rct_ride_entry_vehicle*)-1)
{
break;
}
if (vehicle->sprite_width == 0)
{
vehicle->sprite_width = vehicleEntry->sprite_width;
@ -8700,4 +8708,4 @@ void fix_invalid_vehicle_sprite_sizes()
}
}
}
}
}