Merge mainline into legacy_parser

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-12 14:01:25 +02:00
commit 2d06d22b0c
4 changed files with 26 additions and 4 deletions

View file

@ -128,7 +128,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
if (! menu_args)
goto fail;
for (i = 0; args[i]; i++)
for (i = 0; i < argc; i++)
{
menu_args[i] = grub_strdup (args[i]);
if (! menu_args[i])