From ba10b8478961845efeeda6ff3b956d34b770c0b4 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sun, 26 Jul 2020 17:16:27 +0200 Subject: [PATCH] Fix #12478: Crash in track_block_get_next() --- src/openrct2/ride/Ride.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index a0238c7384..eecb6c24a3 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -555,6 +555,9 @@ bool track_block_get_next_from_zero( */ bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32_t* direction) { + if (input == nullptr || input->element == nullptr) + return false; + auto inputElement = input->element->AsTrack(); if (inputElement == nullptr) return false;