diff options
| author | Kai Tietz <kai.tietz@onevision.com> | 2011-04-09 16:05:58 +0000 |
|---|---|---|
| committer | Kai Tietz <kai.tietz@onevision.com> | 2011-04-09 16:05:58 +0000 |
| commit | 1cafbaf10ee11d9e9eb6c3bd92fd9bcbc29001bf (patch) | |
| tree | 22e759dc9124dad49a455eb6c464277b2dba305b /bfd/peXXigen.c | |
| parent | 1ee7d54cce1395409f7ec28486f91d037d10c139 (diff) | |
| download | binutils-redhat-1cafbaf10ee11d9e9eb6c3bd92fd9bcbc29001bf.tar.gz | |
2011-04-09 Kai Tietz <ktietz@redhat.com>
* peXXigen.c (_bfd_XXi_final_link_postscripte): Sort pdata in temporary
buffer and use rawsize for sorting.
* coffcode.h (coff_compute_section_file_positions): Set rawsize
before doing alignment.
Diffstat (limited to 'bfd/peXXigen.c')
| -rw-r--r-- | bfd/peXXigen.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index 322c5ea8e4..e5065464c0 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -2458,15 +2458,23 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) if (sec) { - bfd_size_type x = sec->rawsize ? sec->rawsize : sec->size; + bfd_size_type x = sec->rawsize; + bfd_byte *tmp_data = NULL; - if (x && bfd_get_section_contents (abfd, sec, pfinfo->contents, 0, x)) + if (x) + tmp_data = bfd_malloc (x); + + if (tmp_data != NULL) { - qsort (pfinfo->contents, - (size_t) ((sec->size <x ? sec->size : x) / 12), - 12, sort_x64_pdata); - bfd_set_section_contents (pfinfo->output_bfd, sec, - pfinfo->contents, 0, x); + if (bfd_get_section_contents (abfd, sec, tmp_data, 0, x)) + { + qsort (tmp_data, + (size_t) (x / 12), + 12, sort_x64_pdata); + bfd_set_section_contents (pfinfo->output_bfd, sec, + tmp_data, 0, x); + } + free (tmp_data); } } } |