From f28db5731f86093dfa6132290cc860526cfd4428 Mon Sep 17 00:00:00 2001 From: rwjuk Date: Thu, 6 Jul 2017 22:29:51 +0100 Subject: [PATCH] Guard against NULL in fix_invalid_vehicle_sprite_sizes() --- src/openrct2/ride/ride.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 9c18d4d9c3..12f5737656 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -8681,6 +8681,15 @@ 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 || + vehicle == (rct_vehicle*)-1 || + vehicleEntry == NULL || + vehicleEntry == (rct_ride_entry_vehicle*)-1) + { + continue; + } + if (vehicle->sprite_width == 0) { vehicle->sprite_width = vehicleEntry->sprite_width;