diff options
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/compress.c | 4 | ||||
| -rw-r--r-- | bfd/elfcode.h | 20 |
3 files changed, 31 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 164f231..96ab879 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2011-12-14 Nick Clifton <nickc@redhat.com> + + PR ld/12451 + * elfcode.h (elf_checksum_contents): Read in the section's + contents if they are not already available. + * compress.c (bfd_get_full_section_contents): Use zmalloc to + allocate the buffers so that excess bytes are guaranteed to be + zero. + 2011-12-14 Iain Sandoe <iains@gcc.gnu.org> * mach-o-i386.c (text_section_names_xlat): New table. diff --git a/bfd/compress.c b/bfd/compress.c index a82a8bc..713e30a 100644 --- a/bfd/compress.c +++ b/bfd/compress.c @@ -181,7 +181,7 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr) case COMPRESS_SECTION_NONE: if (p == NULL) { - p = (bfd_byte *) bfd_malloc (sz); + p = (bfd_byte *) bfd_zmalloc (sz); if (p == NULL) return FALSE; } @@ -221,7 +221,7 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr) if (!ret) goto fail_compressed; - uncompressed_buffer = (bfd_byte *) bfd_malloc (uncompressed_size); + uncompressed_buffer = (bfd_byte *) bfd_zmalloc (uncompressed_size); if (uncompressed_buffer == NULL) goto fail_compressed; diff --git a/bfd/elfcode.h b/bfd/elfcode.h index b7e0226..f5727fe 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -1097,8 +1097,28 @@ elf_checksum_contents (bfd *abfd, elf_swap_shdr_out (abfd, &i_shdr, &x_shdr); (*process) (&x_shdr, sizeof x_shdr, arg); + /* PR ld/12451: + Process the section's contents; reading them in if necessary. */ if (i_shdr.contents) (*process) (i_shdr.contents, i_shdr.sh_size, arg); + else + { + asection *sec; + + sec = bfd_section_from_elf_index (abfd, count); + if (sec != NULL) + { + if (sec->contents == NULL) + { + /* Force rereading from file. */ + sec->flags &= ~SEC_IN_MEMORY; + if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents)) + continue; + } + if (sec->contents != NULL) + (*process) (sec->contents, i_shdr.sh_size, arg); + } + } } return TRUE; |