mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #8828: Invalid read in window_footpath_invalidate

This commit is contained in:
Ted John 2019-03-09 12:37:12 +00:00
parent f5904c90cb
commit d708234489
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2-ui/windows/Footpath.cpp
View File

@ -563,9 +563,6 @@ static void window_footpath_update(rct_window* w)
*/
static void window_footpath_invalidate(rct_window* w)
{
int32_t selectedPath;
PathSurfaceEntry* pathType;
// Press / unpress footpath and queue type buttons
w->pressed_widgets &= ~(1 << WIDX_FOOTPATH_TYPE);
w->pressed_widgets &= ~(1 << WIDX_QUEUELINE_TYPE);
@ -578,12 +575,15 @@ static void window_footpath_invalidate(rct_window* w)
: WWT_EMPTY;
// Set footpath and queue type button images
selectedPath = gFootpathSelectedId;
pathType = get_path_surface_entry(selectedPath);
int32_t pathImage = pathType->preview;
// Editor-only paths might lack a queue image
int32_t queueImage = (pathType->flags & FOOTPATH_ENTRY_FLAG_SHOW_ONLY_IN_SCENARIO_EDITOR) ? pathImage : pathImage + 1;
auto pathImage = (uint32_t)SPR_NONE;
auto queueImage = (uint32_t)SPR_NONE;
auto pathEntry = get_path_surface_entry(gFootpathSelectedId);
if (pathEntry != nullptr)
{
pathImage = pathEntry->preview;
// Editor-only paths might lack a queue image
queueImage = (pathEntry->flags & FOOTPATH_ENTRY_FLAG_SHOW_ONLY_IN_SCENARIO_EDITOR) ? pathImage : pathImage + 1;
}
window_footpath_widgets[WIDX_FOOTPATH_TYPE].image = pathImage;
window_footpath_widgets[WIDX_QUEUELINE_TYPE].image = queueImage;
}