merge with mainline

This commit is contained in:
BVK Chaitanya 2010-06-01 17:52:31 +05:30
commit a762e3c335
13 changed files with 142 additions and 21 deletions

View file

@ -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];