mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-12 18:42:36 +01:00
Code Issues Releases Wiki Activity

Fix #15579: Crash in track_block_get_next()

Browse Source
This commit is contained in:
Michael Steenbeek
2021-10-26 20:05:13 +02:00
committed by GitHub
parent 2146abb17f
commit dd007c836f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -43,6 +43,7 @@
- Fix: [#15514] Two different “quit to menu” menu items are available in track designer and track design manager. - Fix: [#15514] Two different “quit to menu” menu items are available in track designer and track design manager.
- Fix: [#15560] Memory leak due to OpenGL Renderer not releasing a texture. - Fix: [#15560] Memory leak due to OpenGL Renderer not releasing a texture.
- Fix: [#15567] Litter not being counted correctly during Park rating calculation (original bug). - Fix: [#15567] Litter not being counted correctly during Park rating calculation (original bug).
- Fix: [#15579] Crash in track_block_get_next().
- Fix: [#15582] [Plugin] Litter properties return incorrect values. - Fix: [#15582] [Plugin] Litter properties return incorrect values.
- Fix: [#15584] Ride income underflows when on-ride photos are making losses. - Fix: [#15584] Ride income underflows when on-ride photos are making losses.
- Fix: [#15612] Crash when placing walls beside certain scenery objects. - Fix: [#15612] Crash when placing walls beside certain scenery objects.

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

@@ -525,7 +525,6 @@ bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32
return false; return false;
auto inputElement = input->element->AsTrack(); auto inputElement = input->element->AsTrack();
const auto& ted = GetTrackElementDescriptor(inputElement->GetTrackType());
if (inputElement == nullptr) if (inputElement == nullptr)
return false; return false;
@@ -534,6 +533,7 @@ bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32
if (ride == nullptr) if (ride == nullptr)
return false; return false;
const auto& ted = GetTrackElementDescriptor(inputElement->GetTrackType());
const auto* trackBlock = ted.Block; const auto* trackBlock = ted.Block;
if (trackBlock == nullptr) if (trackBlock == nullptr)
return false; return false;