From 48a2460393c634db373caad3f48f417ee64d15a8 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 16 Oct 2017 07:25:58 -0500 Subject: [PATCH] [libpng16] Do not enable tRNS having trans_color with out-of-range value. --- ANNOUNCE | 6 +++--- CHANGES | 4 ++-- pngset.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index b40645ccc..a845c5e70 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.35beta01 - October 15, 2017 +Libpng 1.6.35beta01 - October 16, 2017 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. @@ -24,12 +24,12 @@ Other information: Changes since the last public release (1.6.34): -Version 1.6.35beta01 [October 15, 2017] +Version 1.6.35beta01 [October 16, 2017] Restored 21 of the contrib/pngsuite/i*.png, which do not cause test failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png. Added calls to png_set_*() transforms commonly used by browsers to the fuzzer. - Nullify trans_color with out-of-range value. + Do not enable tRNS having trans_color with out-of-range value. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 6fa30dc80..18c9846c4 100644 --- a/CHANGES +++ b/CHANGES @@ -6040,12 +6040,12 @@ Version 1.6.33 [September 28, 2017] Version 1.6.34 [September 29, 2017] Removed contrib/pngsuite/i*.png; some of caused test failures. -Version 1.6.35beta01 [October 15, 2017] +Version 1.6.35beta01 [October 16, 2017] Restored 21 of the contrib/pngsuite/i*.png, which do not cause test failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png. Added calls to png_set_*() transforms commonly used by browsers to the fuzzer. - Nullify trans_color with out-of-range value. + Do not enable tRNS having trans_color with out-of-range value. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngset.c b/pngset.c index d2ee44f18..d6b540384 100644 --- a/pngset.c +++ b/pngset.c @@ -1038,7 +1038,7 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr, { png_warning(png_ptr, "tRNS chunk has out-of-range samples for bit_depth"); - trans_color = NULL; + return; } }