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

Fix #23701: Potential crash when using mouse wheel on some widgets

Browse Source
This commit is contained in:
Matt
2025-01-25 16:33:14 +02:00
committed by GitHub
parent cf448753c1
commit fa0e7342ec
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2-ui/interface/Window.cpp
View File

@@ -164,6 +164,9 @@ namespace OpenRCT2
if (widgets[index].type != WindowWidgetType::Spinner && widgets[index].type != WindowWidgetType::ImgBtn) if (widgets[index].type != WindowWidgetType::Spinner && widgets[index].type != WindowWidgetType::ImgBtn)
return false; return false;
if (static_cast<size_t>(index + 2) >= widgets.size())
return false;
if (widgets[index + 1].type != buttonType) if (widgets[index + 1].type != buttonType)
return false; return false;
@@ -241,6 +244,8 @@ namespace OpenRCT2
targetWidgetIndex += wheel < 0 ? 1 : 2; targetWidgetIndex += wheel < 0 ? 1 : 2;
} }
assert(targetWidgetIndex >= 0 && targetWidgetIndex < w.widgets.size());
if (WidgetIsDisabled(w, targetWidgetIndex)) if (WidgetIsDisabled(w, targetWidgetIndex))
{ {
return false; return false;