* normal/main.c (grub_normal_add_menu_entry): Avoid going out of args.

	Reported by: Seth Goldberg.

diff --git a/ChangeLog b/ChangeLog
index aa9363dd77320da5e5fde80d2aedf8fc0cdbfef8..2d9015cfba1d23977e0cfa1b058903f343e1069d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * normal/main.c (grub_normal_add_menu_entry): Avoid going out of args.
+       Reported by: Seth Goldberg.
+
 2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix incorrect

diff --git a/normal/main.c b/normal/main.c
index 4ed17e82cb8001a549bfd2265eb37b925e476c02..14a25032fd2127e97c7e9ff964711780f27c2b2c 100644 (file)
--- a/normal/main.c
+++ b/normal/main.c
@@ -204,7 +204,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
   for (i = 0; i < argc; i++)
     {
       /* Capture arguments.  */
-      if (grub_strncmp ("--", args[i], 2) == 0)
+      if (grub_strncmp ("--", args[i], 2) == 0 && i + 1 < argc)
        {
          const char *arg = &args[i][2];