petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Make sort list function lists safer. (#12574)

Browse Source 
GUIList has a pointer only to the start of each sort/filter func list, which has the potential for UB as it is unable to validate that the selected sort or filter type is in range.

Use a std::span instead and check if the selected type is in range before using it.
This commit is contained in:
Peter Nelson
2024-04-25 21:00:49 +01:00
committed by GitHub
parent 9b747a173d
commit 5bc9854be2
14 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/industry_gui.cpp
View File

@@ -1326,7 +1326,7 @@ protected:
/* Constants for sorting industries */
static const StringID sorter_names[];
static GUIIndustryList::SortFunction * const sorter_funcs[];
static const std::initializer_list<GUIIndustryList::SortFunction * const> sorter_funcs;
GUIIndustryList industries{IndustryDirectoryWindow::produced_cargo_filter};
Scrollbar *vscroll;
@@ -1902,7 +1902,7 @@ public:
Listing IndustryDirectoryWindow::last_sorting = {false, 0};
/* Available station sorting functions. */
GUIIndustryList::SortFunction * const IndustryDirectoryWindow::sorter_funcs[] = {
const std::initializer_list<GUIIndustryList::SortFunction * const> IndustryDirectoryWindow::sorter_funcs = {
&IndustryNameSorter,
&IndustryTypeSorter,
&IndustryProductionSorter,