mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #17797: NPE in ride_check_block_brakes()

This commit is contained in:
Gymnasiast 2022-08-13 16:51:48 +02:00
parent 807e080d41
commit ec81a5ff14
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/ride/Ride.cpp
View File

@ -2664,15 +2664,18 @@ void Ride::ChainQueues() const
* *
* rct2: 0x006D3319 * rct2: 0x006D3319
*/ */
static ResultWithMessage ride_check_block_brakes(CoordsXYE* input, CoordsXYE* output) static ResultWithMessage RideCheckBlockBrakes(const CoordsXYE& input, CoordsXYE* output)
{ {
RideId rideIndex = input->element->AsTrack()->GetRideIndex(); if (input.element == nullptr || input.element->GetType() != TileElementType::Track)
return { false };
RideId rideIndex = input.element->AsTrack()->GetRideIndex();
rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == rideIndex) if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == rideIndex)
ride_construction_invalidate_current_track(); ride_construction_invalidate_current_track();
track_circuit_iterator it; track_circuit_iterator it;
track_circuit_iterator_begin(&it, *input); track_circuit_iterator_begin(&it, input);
while (track_circuit_iterator_next(&it)) while (track_circuit_iterator_next(&it))
{ {
if (it.current.element->AsTrack()->GetTrackType() == TrackElemType::BlockBrakes) if (it.current.element->AsTrack()->GetTrackType() == TrackElemType::BlockBrakes)
@ -3926,7 +3929,7 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
if (IsBlockSectioned()) if (IsBlockSectioned())
{ {
auto blockBrakeCheck = ride_check_block_brakes(&trackElement, &problematicTrackElement); auto blockBrakeCheck = RideCheckBlockBrakes(trackElement, &problematicTrackElement);
if (!blockBrakeCheck.Successful) if (!blockBrakeCheck.Successful)
{ {
ride_scroll_to_track_error(&problematicTrackElement); ride_scroll_to_track_error(&problematicTrackElement);
@ -4061,7 +4064,7 @@ ResultWithMessage Ride::Open(bool isApplying)
if (IsBlockSectioned()) if (IsBlockSectioned())
{ {
auto blockBrakeCheck = ride_check_block_brakes(&trackElement, &problematicTrackElement); auto blockBrakeCheck = RideCheckBlockBrakes(trackElement, &problematicTrackElement);
if (!blockBrakeCheck.Successful) if (!blockBrakeCheck.Successful)
{ {
ride_scroll_to_track_error(&problematicTrackElement); ride_scroll_to_track_error(&problematicTrackElement);