← Back to branch summary

~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/fix-872244

« back to all changes in this revision

Viewing changes to grub-core/loader/i386/bsdXX.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-17 23:59:10 UTC
  • mto: (17.3.55 sid)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: james.westby@ubuntu.com-20110517235910-ma8u889vyjdfro27
Tags: upstream-1.99
Import upstream version 1.99

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/loader/i386/bsdXX.c
195
195
        chunk_size = s->sh_addr + s->sh_size;
196
196
    }
197
197
 
 
198
  if (chunk_size < sizeof (e))
 
199
    chunk_size = sizeof (e);
 
200
  chunk_size += e.e_phnum * e.e_phentsize;
 
201
  chunk_size += e.e_shnum * e.e_shentsize;
 
202
 
198
203
  {
199
204
    grub_relocator_chunk_t ch;
200
205