From c2ffc8e956be5df59fd2fa96c4102e02a78f1799 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 20:46:16 +0200
Subject: [PATCH] 	* normal/main.c (grub_normal_add_menu_entry): Avoid
 going out of args. 	Reported by: Seth Goldberg.

---
 ChangeLog     | 5 +++++
 normal/main.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aa9363dd7..2d9015cfb 100644
--- 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 4ed17e82c..14a25032f 100644
--- 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];