mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
chunk handling.
This commit is contained in:
Glenn Randers-Pehrson
2016-10-28 15:50:46 -05:00
parent 858cb585d7
commit 2accfbd6f3
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ANNOUNCE
View File

@@ -26,6 +26,8 @@ Other information:
Changes since the last public release (1.6.26): Changes since the last public release (1.6.26):
Version 1.6.27beta01 [October 28, 2016] 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

2
CHANGES
View File

@@ -5755,6 +5755,8 @@ Version 1.6.26 [October 20, 2016]
Despammed email addresses (replaced "@" with " at "). Despammed email addresses (replaced "@" with " at ").
Version 1.6.27beta01 [October 28, 2016] 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

5
pngrutil.c
View File

@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file /* 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 * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (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 #if ZLIB_VERNUM >= 0x1281
/* Turn off validation of the ADLER32 checksum in IDAT chunks */ /* 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); ret = inflateValidate(&png_ptr->zstream, 0);
#endif #endif