Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ui/selmenu.cpp: Fixed out-of-bounds access when no primary items are visible (fixes GitHub #12429).

Browse Source 
Also fixed separator being highlighted as though it were selectable.
This commit is contained in:
Vas Crabb 2024-06-03 00:45:39 +10:00
parent bbf2c77d52
commit 9af617c8ee
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/cpu/mipsx/mipsxdasm.h
View File

@ -16,4 +16,4 @@ public:
virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
};
#endif
#endif // MAME_CPU_MIPSX_MIPSXDASM_H

4
src/frontend/mame/ui/selgame.cpp
View File

@ -196,7 +196,7 @@ void menu_select_game::menu_deactivated()
bool menu_select_game::handle(event const *ev)
{
if (!m_prev_selected && item_count() > 0)
if (!m_prev_selected && (item_count() > 0))
m_prev_selected = item(0).ref();
// if I have to select software, force software list submenu
@ -405,7 +405,7 @@ void menu_select_game::populate()
item_append(_("System Settings"), 0, (void *)(uintptr_t)CONF_MACHINE);
m_skip_main_items = 3;
if (m_prev_selected && !have_prev_selected && item_count() > 0)
if (m_prev_selected && !have_prev_selected && (item_count() > 0))
m_prev_selected = item(0).ref();
}
else

37
src/frontend/mame/ui/selmenu.cpp
View File

@ -2598,7 +2598,7 @@ std::tuple<int, bool, bool> menu_select_launch::handle_middle_down(bool changed,
{
// left panel
assert(show_left_panel());
if ((get_focus() == focused_menu::MAIN) && (selected_index() <= m_available_items))
if ((get_focus() == focused_menu::MAIN) && (selected_index() < m_available_items))
m_prev_selected = get_selection_ref();
set_focus(focused_menu::LEFT);
return std::make_tuple(IPT_INVALID, true, true);
@ -2607,7 +2607,7 @@ std::tuple<int, bool, bool> menu_select_launch::handle_middle_down(bool changed,
{
// right panel
assert(show_right_panel());
if ((get_focus() == focused_menu::MAIN) && (selected_index() <= m_available_items))
if ((get_focus() == focused_menu::MAIN) && (selected_index() < m_available_items))
m_prev_selected = get_selection_ref();
set_focus((y < m_right_tabs_bottom) ? focused_menu::RIGHTTOP : focused_menu::RIGHTBOTTOM);
return std::make_tuple(IPT_INVALID, true, true);
@ -3157,7 +3157,7 @@ bool menu_select_launch::main_force_visible_selection()
return true;
}
}
else
else if (m_prev_selected)
{
int selection(0);
while ((m_available_items > selection) && (item(selection).ref() != m_prev_selected))
@ -3366,8 +3366,6 @@ void menu_select_launch::draw(u32 flags)
// work out colours
rgb_t fgcolor = ui().colors().text_color();
rgb_t bgcolor = ui().colors().text_bg_color();
bool const hovered(is_selectable(pitem) && pointer_in_rect(m_primary_items_hbounds.first, linetop, m_primary_items_hbounds.second, linebottom));
bool const pointerline((pointer_action::MAIN_TRACK_LINE == m_pointer_action) && ((m_primary_lines + linenum) == m_clicked_line));
if (is_selected(itemnum) && (get_focus() == focused_menu::MAIN))
{
// if we're selected, draw with a different background
@ -3379,19 +3377,24 @@ void menu_select_launch::draw(u32 flags)
bgcolor, rgb_t(43, 43, 43),
hilight_main_texture(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_TEXWRAP(1));
}
else if (pointerline && hovered)
else if (is_selectable(pitem))
{
// draw selected highlight for tracked item
fgcolor = ui().colors().selected_color();
bgcolor = ui().colors().selected_bg_color();
highlight(m_primary_items_hbounds.first, linetop, m_primary_items_hbounds.second, linebottom, bgcolor);
}
else if (pointerline || (!m_ui_error && !(flags & PROCESS_NOINPUT) && hovered && pointer_idle()))
{
// draw hover highlight when hovered over or dragged off
fgcolor = ui().colors().mouseover_color();
bgcolor = ui().colors().mouseover_bg_color();
highlight(m_primary_items_hbounds.first, linetop, m_primary_items_hbounds.second, linebottom, bgcolor);
bool const hovered(pointer_in_rect(m_primary_items_hbounds.first, linetop, m_primary_items_hbounds.second, linebottom));
bool const pointerline((pointer_action::MAIN_TRACK_LINE == m_pointer_action) && ((m_primary_lines + linenum) == m_clicked_line));
if (pointerline && hovered)
{
// draw selected highlight for tracked item
fgcolor = ui().colors().selected_color();
bgcolor = ui().colors().selected_bg_color();
highlight(m_primary_items_hbounds.first, linetop, m_primary_items_hbounds.second, linebottom, bgcolor);
}
else if (pointerline || (!m_ui_error && !(flags & PROCESS_NOINPUT) && hovered && pointer_idle()))
{
// draw hover highlight when hovered over or dragged off
fgcolor = ui().colors().mouseover_color();
bgcolor = ui().colors().mouseover_bg_color();
highlight(m_primary_items_hbounds.first, linetop, m_primary_items_hbounds.second, linebottom, bgcolor);
}
}
if (pitem.type() == menu_item_type::SEPARATOR)

2
src/frontend/mame/ui/selsoft.cpp
View File

@ -424,7 +424,7 @@ menu_select_software::~menu_select_software()
bool menu_select_software::handle(event const *ev)
{
if (m_prev_selected == nullptr && item_count() > 0)
if (!m_prev_selected && (item_count() > 0))
m_prev_selected = item(0).ref();
// FIXME: everything above here used run before events were processed