From fcc41b4647e5328431c971b5eb547b407893e17b Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Thu, 1 Aug 2019 22:42:39 +0100
Subject: [PATCH] Fix #9701: GetRideEntry nullptr can cause stack overflow
 (#9702)

GetName calls GetRideEntry so we can't log the name of the ride. I don't think the log is necessary as we now assume rides can have a null ride entry and all callers should check for this.
---
 src/openrct2/ride/Ride.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 00340d19ef..0abf5cbc8d 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -255,13 +255,7 @@ void get_ride_entry_name(char* name, int32_t index)
 
 rct_ride_entry* Ride::GetRideEntry() const
 {
-    rct_ride_entry* rideEntry = get_ride_entry(subtype);
-    if (rideEntry == nullptr)
-    {
-        auto rideName = GetName();
-        log_error("Invalid ride subtype for ride %s", rideName.c_str());
-    }
-    return rideEntry;
+    return get_ride_entry(subtype);
 }
 
 /**