diff options
| author | Nick Clifton <nickc@redhat.com> | 2011-12-14 16:12:13 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2011-12-14 16:12:13 +0000 |
| commit | 0d13c96b214428affc33281d6d119a873c45acee (patch) | |
| tree | 6eb7565e1c50f28b760697df8e35b7b5229c0737 | |
| parent | 1963ff96820f35bddc85eb409caca40810cbcf57 (diff) | |
| download | gdb-0d13c96b214428affc33281d6d119a873c45acee.zip gdb-0d13c96b214428affc33281d6d119a873c45acee.tar.gz gdb-0d13c96b214428affc33281d6d119a873c45acee.tar.bz2 | |
When computing checksums, skip the contents of sections with the SHT_NOBITS type.
Revert change to compress.c
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/compress.c | 4 | ||||
| -rw-r--r-- | bfd/elfcode.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 96ab879..9e995a1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -2,7 +2,9 @@ PR ld/12451 * elfcode.h (elf_checksum_contents): Read in the section's - contents if they are not already available. + contents if they are not already available, and the section + actually has some contents. + * compress.c (bfd_get_full_section_contents): Use zmalloc to allocate the buffers so that excess bytes are guaranteed to be zero. diff --git a/bfd/compress.c b/bfd/compress.c index 713e30a..a82a8bc 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_zmalloc (sz); + p = (bfd_byte *) bfd_malloc (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_zmalloc (uncompressed_size); + uncompressed_buffer = (bfd_byte *) bfd_malloc (uncompressed_size); if (uncompressed_buffer == NULL) goto fail_compressed; diff --git a/bfd/elfcode.h b/bfd/elfcode.h index f5727fe..2244874 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -1098,10 +1098,10 @@ elf_checksum_contents (bfd *abfd, (*process) (&x_shdr, sizeof x_shdr, arg); /* PR ld/12451: - Process the section's contents; reading them in if necessary. */ + Process the section's contents, if it has some. Read them in if necessary. */ if (i_shdr.contents) (*process) (i_shdr.contents, i_shdr.sh_size, arg); - else + else if (i_shdr.sh_type != SHT_NOBITS) { asection *sec; |