mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Add null checks throughout

Browse Source
This commit is contained in:
Gymnasiast
2020-07-17 00:32:47 +02:00
parent d703768d5d
commit 742ae947c7
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/ride/TrackDesignRepository.cpp
View File

@@ -86,10 +86,16 @@ public:
{
std::scoped_lock<std::mutex> lock(_objectLookupMutex);
auto* rawObject = object_repository_load_object(&td6->vehicle_object);
const auto* rideEntry = static_cast<const rct_ride_entry*>(
static_cast<RideObject*>(rawObject)->GetLegacyData());
rideType = RCT2RideTypeToOpenRCT2RideType(td6->type, rideEntry);
object_delete(rawObject);
if (rawObject != nullptr)
{
const auto* rideEntry = static_cast<const rct_ride_entry*>(
static_cast<RideObject*>(rawObject)->GetLegacyData());
if (rideEntry != nullptr)
{
rideType = RCT2RideTypeToOpenRCT2RideType(td6->type, rideEntry);
}
object_delete(rawObject);
}
}
TrackRepositoryItem item;