dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use of HasBit beyond field width in ShowDropDownMenu masks

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-06-06 19:24:17 +01:00
parent b5dea7f236
commit 8f25bbc93c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/dropdown.cpp
View File

@@ -485,8 +485,8 @@ void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int butt
DropDownList *list = new DropDownList(); DropDownList *list = new DropDownList();
for (uint i = 0; strings[i] != INVALID_STRING_ID; i++) { for (uint i = 0; strings[i] != INVALID_STRING_ID; i++) {
if (!HasBit(hidden_mask, i)) { if (i >= 32 || !HasBit(hidden_mask, i)) {
*list->Append() = new DropDownListStringItem(strings[i], i, HasBit(disabled_mask, i)); *list->Append() = new DropDownListStringItem(strings[i], i, i < 32 && HasBit(disabled_mask, i));
} }
} }