src/menu: Handle menu item creation failure

diff --git a/src/menu/menu.c b/src/menu/menu.c
index 8790b27e1f7d0f08bdc3a2e88de9584402bad351..22757c552b1819e79322b26edf00b0cd8c2ad2a9 100644 (file)
--- 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 = &current_item->submenu;
+                       if (current_item) {
+                               submenu = &current_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);
                }