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

2009-08-14 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
* loader/i386/multiboot.c (grub_multiboot_unload): Don't free mbi and
	mbi->cmdline but free playground.
This commit is contained in:
phcoder 2009-08-14 15:15:33 +00:00
parent c60cee8ee1
commit c166d79e62
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-08-14 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/multiboot.c (grub_multiboot_unload): Don't free mbi and
mbi->cmdline but free playground.
2009-08-14 Vladimir Serbinenko <phcoder@gmail.com> 2009-08-14 Vladimir Serbinenko <phcoder@gmail.com>
Handle group offset on UFS1. Handle group offset on UFS1.

10
loader/i386/multiboot.c
View file

@ -53,7 +53,7 @@ extern grub_dl_t my_mod;
static struct grub_multiboot_info *mbi, *mbi_dest; static struct grub_multiboot_info *mbi, *mbi_dest;
static grub_addr_t entry; static grub_addr_t entry;
static char *playground; static char *playground = 0;
static grub_size_t code_size; static grub_size_t code_size;
static grub_err_t static grub_err_t
@ -68,7 +68,7 @@ grub_multiboot_boot (void)
static grub_err_t static grub_err_t
grub_multiboot_unload (void) grub_multiboot_unload (void)
{ {
if (mbi) if (playground)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < mbi->mods_count; i++) for (i = 0; i < mbi->mods_count; i++)
@ -79,11 +79,11 @@ grub_multiboot_unload (void)
((struct grub_mod_list *) mbi->mods_addr)[i].cmdline); ((struct grub_mod_list *) mbi->mods_addr)[i].cmdline);
} }
grub_free ((void *) mbi->mods_addr); grub_free ((void *) mbi->mods_addr);
grub_free ((void *) mbi->cmdline); grub_free (playground);
grub_free (mbi);
} }
mbi = 0; mbi = NULL;
playground = NULL;
grub_dl_unref (my_mod); grub_dl_unref (my_mod);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;