summaryrefslogtreecommitdiff
path: root/bfd/compress.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2012-10-19 16:59:55 +0000
committerTom Tromey <tromey@redhat.com>2012-10-19 16:59:55 +0000
commit6697ad6645107efda8cc0cab52a1e7cb1f5a968d (patch)
tree45a7cb6a966fda3fb862b92feb1e7a0fa01a416e /bfd/compress.c
parent3ba55606cb40baca5fda4c0704303ad038480512 (diff)
downloadbinutils-redhat-6697ad6645107efda8cc0cab52a1e7cb1f5a968d.tar.gz
* compress.c: Revert previous patch.
Diffstat (limited to 'bfd/compress.c')
-rw-r--r--bfd/compress.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/bfd/compress.c b/bfd/compress.c
index 34faa088fd..17b5928a02 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: