[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2498] 2009-08-14 Vladimir Serbinenko <address@hidden>
From: |
Vladimir Serbinenko |
Subject: |
[2498] 2009-08-14 Vladimir Serbinenko <address@hidden> |
Date: |
Fri, 14 Aug 2009 15:15:33 +0000 |
Revision: 2498
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2498
Author: phcoder
Date: 2009-08-14 15:15:33 +0000 (Fri, 14 Aug 2009)
Log Message:
-----------
2009-08-14 Vladimir Serbinenko <address@hidden>
* loader/i386/multiboot.c (grub_multiboot_unload): Don't free mbi and
mbi->cmdline but free playground.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/loader/i386/multiboot.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-08-14 13:42:03 UTC (rev 2497)
+++ trunk/grub2/ChangeLog 2009-08-14 15:15:33 UTC (rev 2498)
@@ -1,5 +1,10 @@
2009-08-14 Vladimir Serbinenko <address@hidden>
+ * loader/i386/multiboot.c (grub_multiboot_unload): Don't free mbi and
+ mbi->cmdline but free playground.
+
+2009-08-14 Vladimir Serbinenko <address@hidden>
+
Handle group offset on UFS1.
* fs/ufs.c (grub_ufs_sblock): New field 'cylg_mask'.
Modified: trunk/grub2/loader/i386/multiboot.c
===================================================================
--- trunk/grub2/loader/i386/multiboot.c 2009-08-14 13:42:03 UTC (rev 2497)
+++ trunk/grub2/loader/i386/multiboot.c 2009-08-14 15:15:33 UTC (rev 2498)
@@ -53,7 +53,7 @@
static struct grub_multiboot_info *mbi, *mbi_dest;
static grub_addr_t entry;
-static char *playground;
+static char *playground = 0;
static grub_size_t code_size;
static grub_err_t
@@ -68,7 +68,7 @@
static grub_err_t
grub_multiboot_unload (void)
{
- if (mbi)
+ if (playground)
{
unsigned int i;
for (i = 0; i < mbi->mods_count; i++)
@@ -79,11 +79,11 @@
((struct grub_mod_list *) mbi->mods_addr)[i].cmdline);
}
grub_free ((void *) mbi->mods_addr);
- grub_free ((void *) mbi->cmdline);
- grub_free (mbi);
+ grub_free (playground);
}
- mbi = 0;
+ mbi = NULL;
+ playground = NULL;
grub_dl_unref (my_mod);
return GRUB_ERR_NONE;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2498] 2009-08-14 Vladimir Serbinenko <address@hidden>,
Vladimir Serbinenko <=