From 5efa48326561f8bc90d1fd90d398394dbc32ac72 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 20 Sep 2017 15:53:38 -0500 Subject: [PATCH] [libpng16] Removed a redundant test (suggested by "irwir" in Github issue #180). --- ANNOUNCE | 1 + CHANGES | 1 + pngrutil.c | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 799a8f062..c12d5ae5c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -53,6 +53,7 @@ Version 1.6.33rc01 [September 20, 2017] 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 diff --git a/CHANGES b/CHANGES index eaa508a2f..405d1a3e2 100644 --- a/CHANGES +++ b/CHANGES @@ -6023,6 +6023,7 @@ Version 1.6.33rc01 [September 20, 2017] 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 diff --git a/pngrutil.c b/pngrutil.c index 61b22cd1e..eb6dc6abc 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -738,9 +738,7 @@ png_decompress_chunk(png_structrp png_ptr, { /* 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; } }