From 2aaf26e87b51154cb02a9a9231b5f150225ee111 Mon Sep 17 00:00:00 2001 From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Sun, 12 Jun 2022 21:14:48 +0200 Subject: [PATCH] src/menu: Handle menu item creation failure --- src/menu/menu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/menu/menu.c b/src/menu/menu.c index 8790b27e..22757c55 100644 --- a/src/menu/menu.c +++ b/src/menu/menu.c @@ -268,7 +268,11 @@ handle_menu_element(xmlNode *n, struct server *server) * create an item pointing to the new submenu */ current_item = item_create(current_menu, label); - submenu = ¤t_item->submenu; + if (current_item) { + submenu = ¤t_item->submenu; + } else { + submenu = NULL; + } } ++menu_level; current_menu = menu_create(server, id, label); @@ -282,7 +286,9 @@ handle_menu_element(xmlNode *n, struct server *server) struct menu *menu = menu_get_by_id(id); if (menu) { current_item = item_create(current_menu, menu->label); - current_item->submenu = menu; + if (current_item) { + current_item->submenu = menu; + } } else { wlr_log(WLR_ERROR, "no menu with id '%s'", id); }