From bc2bb96cd76c1c54a9de54de3b0ce5c832bd67e3 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 11 Sep 2016 19:22:28 -0500 Subject: [PATCH] [libpng16] Conditionally compile png_set_benign_errors() in pngread.c --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- pngread.c | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 5517cca92..294faa99b 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.26beta01 - September 3, 2016 +Libpng 1.6.26beta01 - September 12, 2016 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -25,11 +25,12 @@ Other information: Changes since the last public release (1.6.25): -Version 1.6.26beta01 [September 3, 2016] +Version 1.6.26beta01 [September 12, 2016] Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo, bugfix by John Bowler). Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL has allocated memory that libpng needs to free. + Conditionally compile png_set_benign_errors() in pngread.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index c95f4efc4..5c6af71fc 100644 --- a/CHANGES +++ b/CHANGES @@ -5703,11 +5703,12 @@ Version 1.6.25rc05 [August 30, 2016] Version 1.6.25 [September 1, 2016] No changes. -Version 1.6.26beta01 [September 3, 2016] +Version 1.6.26beta01 [September 12, 2016] Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo, bugfix by John Bowler). Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL has allocated memory that libpng needs to free. + Conditionally compile png_set_benign_errors() in pngread.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngread.c b/pngread.c index 100032692..b457fd027 100644 --- a/pngread.c +++ b/pngread.c @@ -1393,7 +1393,9 @@ png_image_read_header(png_voidp argument) png_structrp png_ptr = image->opaque->png_ptr; png_inforp info_ptr = image->opaque->info_ptr; +#ifdef PNG_BENIGN_ERRORS_SUPPORTED png_set_benign_errors(png_ptr, 1/*warn*/); +#endif png_read_info(png_ptr, info_ptr); /* Do this the fast way; just read directly out of png_struct. */