From 2bb8813c41b4a2a7279d994228b60fe277d73c3e Mon Sep 17 00:00:00 2001
From: Xkeeper <xkeeper@gmail.com>
Date: Tue, 5 Feb 2019 10:58:43 -0800
Subject: [PATCH] Fix crash in paint_haunted_house_structure

[OpenRCT2/OpenRCT2#8662]
---
 src/openrct2/ride/gentle/HauntedHouse.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp
index 525179e3a3..d8e0a89844 100644
--- a/src/openrct2/ride/gentle/HauntedHouse.cpp
+++ b/src/openrct2/ride/gentle/HauntedHouse.cpp
@@ -41,6 +41,11 @@ static void paint_haunted_house_structure(
     Ride* ride = get_ride(rideIndex);
     rct_ride_entry* rideEntry = get_ride_entry(ride->subtype);
 
+    if (rideEntry == nullptr)
+    {
+        log_error("Error drawing haunted house, rideEntry is NULL.");
+        return;
+    }
     uint32_t baseImageId = rideEntry->vehicles[0].base_image_id;
 
     if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL)