2005-06-23 Yoshinori K. Okuji <okuji@enbug.org>

* kern/mm.c (grub_free): If the next free block which is being
        merged is the first free block, set the first block to the block
        being freed.
        Reported by Vincent Guffens <guffens@inma.ucl.ac.be>.
This commit is contained in:
okuji 2005-06-23 08:12:19 +00:00
parent 89371b203b
commit 50b5a0a793
3 changed files with 11 additions and 0 deletions

View file

@ -1,3 +1,10 @@
2005-06-23 Yoshinori K. Okuji <okuji@enbug.org>
* kern/mm.c (grub_free): If the next free block which is being
merged is the first free block, set the first block to the block
being freed.
Reported by Vincent Guffens <guffens@inma.ucl.ac.be>.
2005-05-08 Hollis Blanchard <hollis@penguinppc.org> 2005-05-08 Hollis Blanchard <hollis@penguinppc.org>
* boot/powerpc/ieee1275/cmain.c (cmain): Initialize * boot/powerpc/ieee1275/cmain.c (cmain): Initialize

1
THANKS
View file

@ -16,6 +16,7 @@ Robert Bihlmeyer <robbe@orcus.priv.at>
Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk> Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
Tomas Ebenlendr <ebik@ucw.cz> Tomas Ebenlendr <ebik@ucw.cz>
Tsuneyoshi Yasuo <tuneyoshi@naic.co.jp> Tsuneyoshi Yasuo <tuneyoshi@naic.co.jp>
Vincent Guffens <guffens@inma.ucl.ac.be>
Vincent Pelletier <subdino2004@yahoo.fr> Vincent Pelletier <subdino2004@yahoo.fr>
Also, we thank the projects GNU Automake and LZO. Some code Also, we thank the projects GNU Automake and LZO. Some code

View file

@ -295,6 +295,9 @@ grub_free (void *ptr)
if (p + p->size == p->next) if (p + p->size == p->next)
{ {
if (p->next == q)
q = p;
p->next->magic = 0; p->next->magic = 0;
p->size += p->next->size; p->size += p->next->size;
p->next = p->next->next; p->next = p->next->next;