diff options
| author | Alan Modra <amodra@gmail.com> | 2021-01-16 09:45:09 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2021-01-16 11:11:52 +1030 |
| commit | ad92f33d386e050304bf5986f28071ede9dd2284 (patch) | |
| tree | 36b11de05d11e93bf630af6f1bdf4463a799767d | |
| parent | eb6e6af8c17a8f4e120d79cb5f2451ebe60aaf4e (diff) | |
| download | gdb-ad92f33d386e050304bf5986f28071ede9dd2284.zip gdb-ad92f33d386e050304bf5986f28071ede9dd2284.tar.gz gdb-ad92f33d386e050304bf5986f28071ede9dd2284.tar.bz2 | |
Tidy inflateEnd calls
So that no one need worry about the value of Z_OK.
bfd/
* compress.c (decompress_contents): Tidy inflateEnd result test.
binutils/
* readelf.c (uncompress_section_contents): Tidy inflateEnd result test.
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/compress.c | 3 | ||||
| -rw-r--r-- | binutils/ChangeLog | 4 | ||||
| -rw-r--r-- | binutils/readelf.c | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d3282a3..40534b8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,9 @@ 2021-01-16 Alan Modra <amodra@gmail.com> + * compress.c (decompress_contents): Tidy inflateEnd result test. + +2021-01-16 Alan Modra <amodra@gmail.com> + PR 26002 * elflink.c (elf_link_output_extsym): Use version 1 in .gnu.version for undefined unversioned symbols. diff --git a/bfd/compress.c b/bfd/compress.c index 4cd9b2e..2e73c76 100644 --- a/bfd/compress.c +++ b/bfd/compress.c @@ -60,8 +60,7 @@ decompress_contents (bfd_byte *compressed_buffer, break; rc = inflateReset (&strm); } - rc |= inflateEnd (&strm); - return rc == Z_OK && strm.avail_out == 0; + return inflateEnd (&strm) == Z_OK && rc == Z_OK && strm.avail_out == 0; } /* Compress data of the size specified in @var{uncompressed_size} diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 0e3ae10..efb86d2 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2021-01-16 Alan Modra <amodra@gmail.com> + + * readelf.c (uncompress_section_contents): Tidy inflateEnd result test. + 2021-01-15 Alan Modra <amodra@gmail.com> PR 26539 diff --git a/binutils/readelf.c b/binutils/readelf.c index d828d56..5df5108 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -14229,8 +14229,8 @@ uncompress_section_contents (unsigned char ** buffer, break; rc = inflateReset (& strm); } - rc |= inflateEnd (& strm); - if (rc != Z_OK + if (inflateEnd (& strm) != Z_OK + || rc != Z_OK || strm.avail_out != 0) goto fail; |