Fix OpenRCT2#21748: TileElement out of bounds

This fixes crashes observed and allows the park to load. The park is overlarge and breaks some assumptions we have in our code.
janisozaur · Apr 7, 2024 · fa5fc66 · fa5fc66
1 parent 828eb0e
commit fa5fc66
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp
@@ -301,7 +301,14 @@ int32_t TileElementIteratorNext(TileElementIterator* it)
     if (it->element == nullptr)
     {
         it->element = MapGetFirstElementAt(TileCoordsXY{ it->x, it->y });
-        return 1;
+        if (it->element == nullptr)
+        {
+            return 0;
+        }
+        else
+        {
+            return 1;
+        }
     }
 
     if (!it->element->IsLastForTile())
@@ -315,15 +322,29 @@ int32_t TileElementIteratorNext(TileElementIterator* it)
     {
         it->y++;
         it->element = MapGetFirstElementAt(TileCoordsXY{ it->x, it->y });
-        return 1;
+        if (it->element == nullptr)
+        {
+            return 0;
+        }
+        else
+        {
+            return 1;
+        }
     }
 
     if (it->x < (gameState.MapSize.x - 2))
     {
         it->y = 1;
         it->x++;
         it->element = MapGetFirstElementAt(TileCoordsXY{ it->x, it->y });
-        return 1;
+        if (it->element == nullptr)
+        {
+            return 0;
+        }
+        else
+        {
+            return 1;
+        }
     }
 
     return 0;

diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp
@@ -619,6 +619,10 @@ void MapAnimationAutoCreate()
 
 void MapAnimationAutoCreateAtTileElement(TileCoordsXY coords, TileElement* el)
 {
+    if (el == nullptr)
+    {
+        return;
+    }
     auto loc = CoordsXYZ{ coords.ToCoordsXY(), el->GetBaseZ() };
     switch (el->GetType())
     {