From a8d21610fb090ff7e5bf84ff8bcdcd852b2be9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 12 Jun 2020 21:33:07 +0200 Subject: [PATCH] Improve #4617: signs causing crashes (#11094) --- src/openrct2-ui/windows/Sign.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 64d92db9a0..71f997276d 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -177,6 +177,10 @@ rct_window* window_sign_open(rct_windownumber number) } } tile_element++; + if (tile_element >= &gTileElements[std::size(gTileElements)]) + { + return nullptr; + } } int32_t view_z = tile_element->GetBaseZ(); @@ -230,6 +234,10 @@ static void window_sign_mouseup(rct_window* w, rct_widgetindex widgetIndex) } } tile_element++; + if (tile_element >= &gTileElements[std::size(gTileElements)]) + { + return; + } } auto sceneryRemoveAction = LargeSceneryRemoveAction(