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

* grub-core/loader/i386/bsdXX.c (grub_freebsd_load_elfmodule): Account

Browse source 
for modules headers when counting the needed allocation size.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-03-24 12:28:22 +01:00
parent 5657722c3c
commit 8bc66a2ce6
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-03-24 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/bsdXX.c (grub_freebsd_load_elfmodule): Account
for modules headers when counting the needed allocation size.
2011-03-23 Vladimir Serbinenko <phcoder@gmail.com> 2011-03-23 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/gfxterm.c (calculate_normal_character_width): Return 8 * grub-core/term/gfxterm.c (calculate_normal_character_width): Return 8

5
grub-core/loader/i386/bsdXX.c
View file

@ -195,6 +195,11 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
chunk_size = s->sh_addr + s->sh_size; chunk_size = s->sh_addr + s->sh_size;
} }
if (chunk_size < sizeof (e))
chunk_size = sizeof (e);
chunk_size += e.e_phnum * e.e_phentsize;
chunk_size += e.e_shnum * e.e_shentsize;
{ {
grub_relocator_chunk_t ch; grub_relocator_chunk_t ch;