3 files changed, 16 insertions, 7 deletions
diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 88bdd0f..fce1752 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -185,8 +185,11 @@ static void cui_boot_editor_on_exit(struct cui *cui,
 		item->data = cod = talloc_zero(item, struct cui_opt_data);
 
 		cod->name = talloc_asprintf(cod, "User item %u:", insert_pt);
-		pmenu_item_setup(menu, item, insert_pt,
-				talloc_strdup(item, cod->name));
+		if (pmenu_item_setup(menu, item, insert_pt,
+				talloc_strdup(item, cod->name)) == NULL) {
+			talloc_free(item);
+			item = NULL;
+		}
 
 		/* Re-attach the items array. */
 		set_menu_items(menu->ncm, menu->items);
@@ -197,7 +200,8 @@ static void cui_boot_editor_on_exit(struct cui *cui,
 
 	cod->bd = talloc_steal(cod, bd);
 
-	set_current_item(item->pmenu->ncm, item->nci);
+	if (item)
+		set_current_item(item->pmenu->ncm, item->nci);
 	cui_set_current(cui, &cui->main->scr);
 	talloc_free(cui->boot_editor);
 	cui->boot_editor = NULL;
diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index cd7c54e..654c389 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -106,10 +106,8 @@ struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
 	i->pmenu = menu;
 	i->nci = new_item(name, NULL);
 
-	if (!i->nci) {
-		talloc_free(i);
+	if (!i->nci)
 		return NULL;
-	}
 
 	set_item_userptr(i->nci, i);
 
diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index f5e947d..4c3a43f 100644
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -75,7 +75,14 @@ static inline struct cui_opt_data *cod_from_item(struct pmenu_item *item)
 static inline struct pmenu_item *pmenu_item_init(struct pmenu *menu,
 	unsigned int index, const char *name)
 {
-	return pmenu_item_setup(menu, pmenu_item_alloc(menu), index, name);
+	struct pmenu_item *item = pmenu_item_alloc(menu);
+
+	if (pmenu_item_setup(menu, item, index, name)) {
+		talloc_free(item);
+		item = NULL;
+	}
+
+	return item;
 }
 
 /**