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

Fix #21543: Game Crashing with invalid TrackIterator (#21547)

Browse Source 
* Check if el is nullptr

Check if el is nullptr

Format

* Add changelog
This commit is contained in:
Harry Hopkinson
2024-03-09 14:15:28 +00:00
committed by GitHub
parent 048276b67a
commit 0c1fb5fec0
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -2,6 +2,7 @@
------------------------------------------------------------------------ ------------------------------------------------------------------------
- Improved: [#21424] Extra viewports can now rotate independently from the main viewport. - Improved: [#21424] Extra viewports can now rotate independently from the main viewport.
- Fix: [#910] Extra viewport does not preserve the location when rotating. - Fix: [#910] Extra viewport does not preserve the location when rotating.
- Fix: [#21543] Crash with creating a TrackIterator with invalid arguments.
0.4.9 (2024-03-02) 0.4.9 (2024-03-02)
------------------------------------------------------------------------ ------------------------------------------------------------------------

2
src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp
View File

@@ -23,6 +23,8 @@ using namespace OpenRCT2::TrackMetaData;
std::shared_ptr<ScTrackIterator> ScTrackIterator::FromElement(const CoordsXY& position, int32_t elementIndex) std::shared_ptr<ScTrackIterator> ScTrackIterator::FromElement(const CoordsXY& position, int32_t elementIndex)
{ {
auto el = MapGetNthElementAt(position, elementIndex); auto el = MapGetNthElementAt(position, elementIndex);
if (el == nullptr)
return nullptr;
auto origin = GetTrackSegmentOrigin(CoordsXYE(position, el)); auto origin = GetTrackSegmentOrigin(CoordsXYE(position, el));
if (!origin) if (!origin)
return nullptr; return nullptr;