Fix OpenRCT2#10087: crash loading a save with corrupt peeps

ZehMatt · Nov 8, 2019 · f2a3211 · f2a3211
1 parent f4a1b75
commit f2a3211
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp
@@ -603,11 +603,18 @@ void game_fix_save_vars()
             {
                 continue;
             }
+            Ride* ride = get_ride(rideIdx);
+            if (ride == nullptr)
+            {
+                log_warning("Couldn't find ride %u, resetting ride on peep %u", rideIdx, spriteIndex);
+                peep->current_ride = RIDE_ID_NULL;
+                continue;
+            }
             set_format_arg(0, uint32_t, peep->id);
             auto curName = peep->GetName();
             log_warning(
                 "Peep %u (%s) has invalid ride station = %u for ride %u.", spriteIndex, curName.c_str(), srcStation, rideIdx);
-            int8_t station = ride_get_first_valid_station_exit(get_ride(rideIdx));
+            int8_t station = ride_get_first_valid_station_exit(ride);
             if (station == -1)
             {
                 log_warning("Couldn't find station, removing peep %u", spriteIndex);