From cbefc4fe385ba71e3720b91825fbf976e61f2872 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 1 Apr 2021 11:26:14 +0200 Subject: [PATCH] Fix #14412: NPE in vehicle_create_car() --- 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 bbebdea459..9ad59a05f6 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -4084,6 +4084,9 @@ static Vehicle* vehicle_create_car( ride_id_t rideIndex, int32_t vehicleEntryIndex, int32_t carIndex, int32_t vehicleIndex, const CoordsXYZ& carPosition, int32_t* remainingDistance, TrackElement* trackElement) { + if (trackElement == nullptr) + return nullptr; + auto ride = get_ride(rideIndex); if (ride == nullptr) return nullptr;