From f32fe2b7e418c6cb6ca27db2ca0f6fcf7be4436a Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 23 Feb 2021 23:15:19 +0100 Subject: [PATCH] Fix #14145: Crash in RCT2TrackTypeToOpenRCT2() --- src/openrct2/rct2/RCT2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/rct2/RCT2.cpp b/src/openrct2/rct2/RCT2.cpp index f10e93a0f4..c306ea5e79 100644 --- a/src/openrct2/rct2/RCT2.cpp +++ b/src/openrct2/rct2/RCT2.cpp @@ -145,7 +145,7 @@ bool RCT2TrackTypeIsBooster(uint8_t rideType, uint16_t trackType) track_type_t RCT2TrackTypeToOpenRCT2(RCT12TrackType origTrackType, uint8_t rideType) { - if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_FLAT_RIDE)) + if (rideType < std::size(RideTypeDescriptors) && ride_type_has_flag(rideType, RIDE_TYPE_FLAG_FLAT_RIDE)) return RCT12FlatTrackTypeToOpenRCT2(origTrackType); if (origTrackType == TrackElemType::RotationControlToggleAlias && !RCT2TrackTypeIsBooster(rideType, origTrackType)) return TrackElemType::RotationControlToggle;