vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/commands/menuentry.c (grub_cmd_menuentry): Correctly

Browse source 
handle class-free menuentries.
	(grub_normal_add_menu_entry): Add a check to be sure.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-14 12:14:00 +02:00
parent 4c2a3b438e
commit d4de6b01e8
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2011-05-14 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/menuentry.c (grub_cmd_menuentry): Correctly
handle class-free menuentries.
(grub_normal_add_menu_entry): Add a check to be sure.
2011-05-14 Vladimir Serbinenko <phcoder@gmail.com> 2011-05-14 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/at_keyboard.c (set1_e0_mapping): Fix swap between * grub-core/term/at_keyboard.c (set1_e0_mapping): Fix swap between

5
grub-core/commands/menuentry.c
View file

@ -91,7 +91,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
if (! menu_sourcecode) if (! menu_sourcecode)
return grub_errno; return grub_errno;
if (classes) if (classes && classes[0])
{ {
int i; int i;
for (i = 0; classes[i]; i++); /* count # of menuentry classes */ for (i = 0; classes[i]; i++); /* count # of menuentry classes */
@ -255,7 +255,8 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
if (! ctxt->script) if (! ctxt->script)
return grub_normal_add_menu_entry (argc, (const char **) args, return grub_normal_add_menu_entry (argc, (const char **) args,
ctxt->state[0].args, ctxt->state[1].arg, (ctxt->state[0].set ? ctxt->state[0].args
: NULL), ctxt->state[1].arg,
ctxt->state[2].arg, 0, ctxt->state[2].arg, 0,
ctxt->state[3].arg, ctxt->state[3].arg,
ctxt->extcmd->cmd->name[0] == 's'); ctxt->extcmd->cmd->name[0] == 's');