提交 2accfbd6 编写于 作者: G Glenn Randers-Pehrson

[libpng16] Restrict the new ADLER32-skipping to IDAT chunks. It broke iCCP

chunk handling.
上级 858cb585
......@@ -26,6 +26,8 @@ Other information:
Changes since the last public release (1.6.26):
Version 1.6.27beta01 [October 28, 2016]
Restrict the new ADLER32-skipping to IDAT chunks. It broke iCCP chunk
handling.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
......
......@@ -5755,6 +5755,8 @@ Version 1.6.26 [October 20, 2016]
Despammed email addresses (replaced "@" with " at ").
Version 1.6.27beta01 [October 28, 2016]
Restrict the new ADLER32-skipping to IDAT chunks. It broke iCCP chunk
handling.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
......
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.6.26 [October 20, 2016]
* Last changed in libpng 1.6.27 [(PENDING RELEASE)]
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
......@@ -420,7 +420,8 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
#if ZLIB_VERNUM >= 0x1281
/* Turn off validation of the ADLER32 checksum in IDAT chunks */
if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0 &&
png_ptr->zowner == png_IDAT)
ret = inflateValidate(&png_ptr->zstream, 0);
#endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册