From 2828cbb2fcdebb88afbd6fc7cecaefee9c28cf09 Mon Sep 17 00:00:00 2001 From: Xkeeper Date: Tue, 5 Feb 2019 11:14:17 -0800 Subject: [PATCH] Fix crash in FerrisWheel paint [OpenRCT2/OpenRCT2#8662] --- src/openrct2/ride/gentle/FerrisWheel.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index d08e7d36d9..95e69c0617 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -57,6 +57,11 @@ static void paint_ferris_wheel_structure( Ride* ride = get_ride(rideIndex); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); rct_vehicle* vehicle = nullptr; + if (rideEntry == nullptr) + { + log_error("Error drawing Ferris Wheel, rideEntry is NULL."); + return; + } int8_t xOffset = !(direction & 1) ? axisOffset : 0; int8_t yOffset = (direction & 1) ? axisOffset : 0;