Re: [PATCH] Avoid crash on empty menu

[Christian Franke]

Marco Gerards wrote:
> > +      e = get_entry (menu, boot_entry);
> > +      if (! e)
> > +       continue; /* menu is empty */
> >     
>
> Please use proper interpunctions for comments.
>
>   

Fixed.

Christian

2007-11-10  Christian Franke  <address@hidden>

        * normal/menu.c (run_menu): Check for empty menu to avoid crash.
        (grub_menu_run): Likewise.



--- grub2.orig/normal/menu.c    2007-08-20 16:35:20.000000000 +0200
+++ grub2/normal/menu.c 2007-11-10 12:59:54.953125000 +0100
@@ -412,7 +412,11 @@ run_menu (grub_menu_t menu, int nested)
              goto refresh;
 
            case 'e':
-             grub_menu_entry_run (get_entry (menu, first + offset));
+               {
+                 grub_menu_entry_t e = get_entry (menu, first + offset);
+                 if (e)
+                   grub_menu_entry_run (e);
+               }
              goto refresh;
              
            default:
@@ -451,10 +455,13 @@ grub_menu_run (grub_menu_t menu, int nes
       if (boot_entry < 0)
        break;
 
+      e = get_entry (menu, boot_entry);
+      if (! e)
+       continue; /* Menu is empty.  */
+       
       grub_cls ();
       grub_setcursor (1);
 
-      e = get_entry (menu, boot_entry);
       grub_printf ("  Booting \'%s\'\n\n", e->title);
   
       run_menu_entry (e);