commit 5efa48326561f8bc90d1fd90d398394dbc32ac72
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Wed Sep 20 15:53:38 2017 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Wed Sep 20 15:53:38 2017 -0500
tree 0f53ace859006cfaf35f4c96a32e563df5f29f0d
parent 5f0c9fabbc1b976702d959695b15f679c4f32b76

[libpng16] Removed a redundant test (suggested by "irwir" in Github issue #180).

ANNOUNCE

diff --git a/ANNOUNCE b/ANNOUNCE
index 799a8f0..c12d5ae 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -53,6 +53,7 @@
   Initialize memory allocated by png_read_buffer to zero, using memset, to
     stop an oss-fuzz "use of uninitialized value" detection in
     png_icc_check_tag_table()() due to truncated iCCP chunk.
+  Removed a redundant test (suggested by "irwir" in Github issue #180).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

diff --git a/CHANGES b/CHANGES
index eaa508a..405d1a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6023,6 +6023,7 @@
   Initialize memory allocated by png_read_buffer to zero, using memset, to
     stop an oss-fuzz "use of uninitialized value" detection in
     png_icc_check_tag_table()() due to truncated iCCP chunk.
+  Removed a redundant test (suggested by "irwir" in Github issue #180).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

pngrutil.c

diff --git a/pngrutil.c b/pngrutil.c
index 61b22cd..eb6dc6a 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -738,9 +738,7 @@
             {
                /* inflateReset failed, store the error message */
                png_zstream_error(png_ptr, ret);
-
-               if (ret == Z_STREAM_END)
-                  ret = PNG_UNEXPECTED_ZLIB_RETURN;
+               ret = PNG_UNEXPECTED_ZLIB_RETURN;
             }
          }