ui/ncurses: Don't free item in pmenu_item_setup

[petitboot] / ui / ncurses / nc-menu.h

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 4639c5537bd38d00d16115eb472aa4951acd17a9..4c3a43fcca978322d298b220afaf0232b9e98b4e 100644 (file)
--- 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;
 }
 
 /**
@@ -90,6 +97,8 @@ struct pmenu {
        ITEM **items;
        unsigned int item_count;
        unsigned int insert_pt;
+       const char *help_title;
+       const char *help_text;
        int (*hot_key)(struct pmenu *menu, struct pmenu_item *item, int c);
        void (*on_exit)(struct pmenu *menu);
        void (*on_new)(struct pmenu *menu);