merge with mainline
This commit is contained in:
commit
965e0faac8
2 changed files with 6 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2010-09-04 BVK Chaitanya <bvk.groups@gmail.com>
|
||||||
|
|
||||||
|
* grub-core/normal/completion.c (grub_normal_do_completion): Fix
|
||||||
|
grub_free order.
|
||||||
|
|
||||||
2010-09-04 BVK Chaitanya <bvk.groups@gmail.com>
|
2010-09-04 BVK Chaitanya <bvk.groups@gmail.com>
|
||||||
|
|
||||||
Support for passing block of commands as an argument to extcmds.
|
Support for passing block of commands as an argument to extcmds.
|
||||||
|
|
|
@ -500,8 +500,8 @@ grub_normal_do_completion (char *buf, int *restore,
|
||||||
fail:
|
fail:
|
||||||
if (argc != 0)
|
if (argc != 0)
|
||||||
{
|
{
|
||||||
grub_free (argv);
|
|
||||||
grub_free (argv[0]);
|
grub_free (argv[0]);
|
||||||
|
grub_free (argv);
|
||||||
}
|
}
|
||||||
grub_free (match);
|
grub_free (match);
|
||||||
grub_errno = GRUB_ERR_NONE;
|
grub_errno = GRUB_ERR_NONE;
|
||||||
|
|
Loading…
Reference in a new issue