From e4e26eeb2aa65e5b17eac888a41eecfb7adb46d8 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sun, 7 Mar 2021 13:21:23 +0100 Subject: [PATCH] Fix #14167: NPE in Guest::UpdateRideFreeVehicleCheck() --- src/openrct2/peep/Guest.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index f95bbfe3f6..a370acec78 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -3690,6 +3690,8 @@ void Guest::UpdateRideFreeVehicleCheck() return; } vehicle = vehicle->GetCar(CurrentCar); + if (vehicle == nullptr) + return; rct_ride_entry* ride_entry = vehicle->GetRideEntry(); if (ride_entry == nullptr)