From b17e9b1b1898ce97bc16f841da50e58807026b2a Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 7 Aug 2019 23:11:11 +0100 Subject: [PATCH] Fix #9755: Crash when importing ride measurement for null ride --- src/openrct2/rct2/S6Importer.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 7fd0dc0751..58ec61ddee 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -752,9 +752,12 @@ public: if (src.ride_index != RCT12_RIDE_ID_NULL) { auto ride = get_ride(src.ride_index); - ride->measurement = std::make_unique(); - ride->measurement->ride = ride; - ImportRideMeasurement(*ride->measurement, src); + if (ride != nullptr) + { + ride->measurement = std::make_unique(); + ride->measurement->ride = ride; + ImportRideMeasurement(*ride->measurement, src); + } } } }