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

* grub-core/lib/relocator.c (malloc_in_range): Fix memory leak.

Browse source 
Change order of allocations to decrease fragmentation.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-28 01:32:38 +01:00
parent 6c21f5d7a1
commit 5a6e39c28f
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/relocator.c (malloc_in_range): Fix memory leak.
Change order of allocations to decrease fragmentation.
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* Makefile.util.def (grub-ofpathname): Enable on all platforms. * Makefile.util.def (grub-ofpathname): Enable on all platforms.

10
grub-core/lib/relocator.c
View file

@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel,
} }
#endif #endif
events = grub_malloc (maxevents * sizeof (events[0]));
eventt = grub_malloc (maxevents * sizeof (events[0])); eventt = grub_malloc (maxevents * sizeof (events[0]));
counter = grub_malloc ((DIGITSORT_MASK + 2) * sizeof (counter[0])); counter = grub_malloc ((DIGITSORT_MASK + 2) * sizeof (counter[0]));
events = grub_malloc (maxevents * sizeof (events[0]));
if (!events || !eventt || !counter) if (!events || !eventt || !counter)
{ {
grub_dprintf ("relocator", "events or counter allocation failed %d\n", grub_dprintf ("relocator", "events or counter allocation failed %d\n",
@ -939,6 +939,9 @@ malloc_in_range (struct grub_relocator *rel,
/* Malloc is available again. */ /* Malloc is available again. */
grub_mm_base = base_saved; grub_mm_base = base_saved;
grub_free (eventt);
grub_free (counter);
{ {
int last_start = 0; int last_start = 0;
int inreg = 0, regbeg = 0, ncol = 0; int inreg = 0, regbeg = 0, ncol = 0;
@ -1165,12 +1168,17 @@ malloc_in_range (struct grub_relocator *rel,
free_subchunk (&res->subchunks[i]); free_subchunk (&res->subchunks[i]);
grub_free (res->subchunks); grub_free (res->subchunks);
grub_dprintf ("relocator", "allocation failed with out-of-memory\n"); grub_dprintf ("relocator", "allocation failed with out-of-memory\n");
grub_free (events);
return 0; return 0;
} }
} }
res->src = target; res->src = target;
res->size = size; res->size = size;
grub_free (events);
grub_dprintf ("relocator", "allocated: 0x%lx+0x%lx\n", (unsigned long) target, grub_dprintf ("relocator", "allocated: 0x%lx+0x%lx\n", (unsigned long) target,
(unsigned long) size); (unsigned long) size);