gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-18 20:10:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix segfault on right-click sweep of menu

Browse Source 
bug description: after menu is displayed I get a segfault when trying to hover over the last menu
entry. it looks like under some circumstances menu->entries[] gets accessed past the last valid
value (off by one).

how to reproduce:
right-click desktop to show menu and keep right mouse button pressed
sweep mouse up-down the menu a few times - it crashes all the time between 1-5 sweeps

this commit fixes the unwanted behaviour, in active use since december 2021.
This commit is contained in:
Petre Rodan
2023-01-06 06:58:11 +02:00
committed by Carlos R. Mafra
parent 66b0ee3c4d
commit c089c6aea4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/menu.c
View File

@@ -1764,7 +1764,7 @@ static void menuMouseDown(WObjDescriptor * desc, XEvent * event)
goto byebye; goto byebye;
} }
entry_no = getEntryAt(menu, x, y); entry_no = getEntryAt(menu, x, y);
if (entry_no >= 0) { if ((entry_no >= 0) && (entry_no < menu->entry_no)) {
entry = menu->entries[entry_no]; entry = menu->entries[entry_no];
if (!close_on_exit && (bev->state & ControlMask) && smenu && entry->flags.editable) { if (!close_on_exit && (bev->state & ControlMask) && smenu && entry->flags.editable) {
@@ -1940,7 +1940,7 @@ static void menuMouseDown(WObjDescriptor * desc, XEvent * event)
if (!delayed_select) { if (!delayed_select) {
entry_no = getEntryAt(menu, x, y); entry_no = getEntryAt(menu, x, y);
if (entry_no >= 0) { if ((entry_no >= 0) && (entry_no < menu->entry_no)) {
entry = menu->entries[entry_no]; entry = menu->entries[entry_no];
if (entry->flags.enabled && entry->cascade >= 0 && menu->cascades) { if (entry->flags.enabled && entry->cascade >= 0 && menu->cascades) {
WMenu *submenu = menu->cascades[entry->cascade]; WMenu *submenu = menu->cascades[entry->cascade];