mraber/xmenu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #29 from TobiasRH/fix-separator-segfault

Browse Source 
Fix a segfault if a sub-menu is added to a separator.
This commit is contained in:
phillbush 2021-04-10 18:49:13 -03:00 committed by GitHub
commit c4d552d669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xmenu.c
View File

@ -432,6 +432,10 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file)
for (item = prevmenu->list; item->next != NULL; item = item->next) for (item = prevmenu->list; item->next != NULL; item = item->next)
; ;
/* a separator is no valid root for a submenu */
if (!item->label)
errx(1, "a separator is no valid root for a submenu");
prevmenu = menu; prevmenu = menu;
menu->caller = item; menu->caller = item;
item->submenu = menu; item->submenu = menu;
@ -717,8 +721,10 @@ setupmenu(struct Menu *menu, XClassHint *classh)
/* set window title (used if wflag is on) */ /* set window title (used if wflag is on) */
if (menu->parent == NULL) { if (menu->parent == NULL) {
title = classh->res_name; title = classh->res_name;
} else { } else if (menu->caller->output) {
title = menu->caller->output; title = menu->caller->output;
} else {
title = "\0";
} }
XStringListToTextProperty(&title, 1, &wintitle); XStringListToTextProperty(&title, 1, &wintitle);