From 4f80ef50eff75d674a884784f14464477182ea57 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Mon, 26 Jul 2021 21:17:17 +0200 Subject: [PATCH] Fix #15086: Crash in vehicle_create_trains() --- 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 f2f9e31f12..06b77e8b7f 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -4330,6 +4330,9 @@ static void vehicle_create_trains(ride_id_t rideIndex, const CoordsXYZ& trainsPo remainingDistance = 0; } train_ref train = vehicle_create_train(rideIndex, trainsPos, vehicleIndex, &remainingDistance, trackElement); + if (train.head == nullptr || train.tail == nullptr) + continue; + if (vehicleIndex == 0) { firstTrain = train;