Merge pull request #11 from open-power/coverity

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

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index b42dc23e556c5f2dc85081a2a1dcfb718671e8ab..dda7626410974ec778089f8a24b9ed6f6857bc2d 100644 (file)
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -264,8 +264,6 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
                }
                if (matched) {
                        snprintf(buf,sizeof(buf),"[%s: %s / %s]",
-                               dev->type == DEVICE_TYPE_OPTICAL ?
-                               _("CD/DVD") :
                                device_type_display_name(dev->type),
                                bd->name, bd->uuid);
                }
@@ -324,9 +322,10 @@ static int pmenu_item_get_index(const struct pmenu_item *item)
 {
        unsigned int i;
 
-       for (i = 0; i < item->pmenu->item_count; i++)
-               if (item->pmenu->items[i] == item->nci)
-                       return i;
+       if (item)
+               for (i = 0; i < item->pmenu->item_count; i++)
+                       if (item->pmenu->items[i] == item->nci)
+                               return i;
 
        pb_log("%s: not found: %p %s\n", __func__, item,
                (item ? item->nci->name.str : "(null)"));