mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-21 06:43:04 +01:00
Code Issues Releases Wiki Activity

Fix #9761: invalid read in ride_measurement_update

Browse Source
This commit is contained in:
Ted John
2019-08-08 12:55:14 +01:00
parent 53f228fc33
commit 08677a3322
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/ride/Ride.cpp
View File

@@ -2929,11 +2929,16 @@ static void ride_music_update(Ride* ride)
static void ride_measurement_update(RideMeasurement* measurement) static void ride_measurement_update(RideMeasurement* measurement)
{ {
auto ride = measurement->ride; auto ride = measurement->ride;
if (ride == nullptr || measurement->vehicle_index >= std::size(ride->vehicles))
return;
auto spriteIndex = ride->vehicles[measurement->vehicle_index]; auto spriteIndex = ride->vehicles[measurement->vehicle_index];
if (spriteIndex == SPRITE_INDEX_NULL) if (spriteIndex == SPRITE_INDEX_NULL)
return; return;
auto vehicle = GET_VEHICLE(spriteIndex); auto vehicle = GET_VEHICLE(spriteIndex);
if (vehicle == nullptr)
return;
if (measurement->flags & RIDE_MEASUREMENT_FLAG_UNLOADING) if (measurement->flags & RIDE_MEASUREMENT_FLAG_UNLOADING)
{ {