From 8b8e9bfb298729c9edfadf593077e203e569bb68 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 13 Apr 2012 12:00:45 -0500 Subject: [PATCH] [libpng15] Enable png_set_check_for_invalid_index() for both read and write. --- ANNOUNCE | 9 +++++++-- CHANGES | 7 ++++++- pngset.c | 6 ++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 944571367..bd0068c06 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.11beta01 - April 12, 2012 +Libpng 1.5.11beta01 - April 13, 2012 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. @@ -26,7 +26,12 @@ Other information: Changes since the last public release (1.5.10): -Version 1.5.11 [April 12, 2012] +Version 1.5.11 [April 13, 2012] + Revised scripts/makefile.darwin: use system zlib; remove quotes around + architecture list; add missing ppc architecture; add architecture options + to shared library link; don't try to create a shared lib based on missing + RELEASE variable. + Enable png_set_check_for_invalid_index() for both read and write. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index d62444d87..5af2529e3 100644 --- a/CHANGES +++ b/CHANGES @@ -3854,7 +3854,12 @@ Version 1.5.10 [March 29, 2012] Revised png_set_text_2() to avoid potential memory corruption (fixes CVE-2011-3048). -Version 1.5.11 [April 12, 2012] +Version 1.5.11 [April 13, 2012] + Revised scripts/makefile.darwin: use system zlib; remove quotes around + architecture list; add missing ppc architecture; add architecture options + to shared library link; don't try to create a shared lib based on missing + RELEASE variable. + Enable png_set_check_for_invalid_index() for both read and write. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngset.c b/pngset.c index e0118fa8c..10891c7a6 100644 --- a/pngset.c +++ b/pngset.c @@ -1291,8 +1291,10 @@ png_set_benign_errors(png_structp png_ptr, int allowed) } #endif /* PNG_BENIGN_ERRORS_SUPPORTED */ -#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED - /* Do not report invalid palette index; added at libng-1.5.10 */ +#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED +/* Whether to report invalid palette index; added at libng-1.5.10 + * allowed - one of 0: disable; 1: enable + */ void PNGAPI png_set_check_for_invalid_index(png_structp png_ptr, int allowed) {