From 67d004eb5fb3d4b79dda53866b4a70983cd7ed06 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 19 Oct 2012 16:59:57 +0000 Subject: [PATCH] * compress.c: Revert previous patch. --- bfd/ChangeLog | 4 ++++ bfd/compress.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ab216bd4204..76d91c2d15d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2012-10-19 Tom Tromey + + * compress.c: Revert previous patch. + 2012-10-19 Tom Tromey * compress.c (bfd_get_full_section_contents): Don't cache diff --git a/bfd/compress.c b/bfd/compress.c index 34faa088fd4..17b5928a026 100644 --- a/bfd/compress.c +++ b/bfd/compress.c @@ -165,6 +165,7 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr) bfd_size_type uncompressed_size; bfd_size_type rawsize; bfd_byte *compressed_buffer; + bfd_byte *uncompressed_buffer; #endif if (abfd->direction != write_direction && sec->rawsize != 0) @@ -219,24 +220,24 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr) if (!ret) goto fail_compressed; - if (p == NULL) - p = (bfd_byte *) bfd_malloc (uncompressed_size); - if (p == NULL) + uncompressed_buffer = (bfd_byte *) bfd_malloc (uncompressed_size); + if (uncompressed_buffer == NULL) goto fail_compressed; if (!decompress_contents (compressed_buffer, compressed_size, - p, uncompressed_size)) + uncompressed_buffer, uncompressed_size)) { bfd_set_error (bfd_error_bad_value); - free (p); + free (uncompressed_buffer); fail_compressed: free (compressed_buffer); return FALSE; } free (compressed_buffer); - *ptr = p; - return TRUE; + sec->contents = uncompressed_buffer; + sec->compress_status = COMPRESS_SECTION_DONE; + /* Fall thru */ #endif case COMPRESS_SECTION_DONE: -- 2.30.2