From 066cb342681eff0a9330254d25a84aa4aa76b11c Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 19 Sep 2017 15:52:36 -0500 Subject: [PATCH] [libpng16] Fix some comments --- png.c | 17 ++++++----------- pngrutil.c | 2 +- pngset.c | 4 ++-- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/png.c b/png.c index 4e48658c2..487fb7e2a 100644 --- a/png.c +++ b/png.c @@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.33beta04 - September 17, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.33beta04 - September 19, 2017" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.6.33beta04 - September 17, 2017\ + return "libpng version 1.6.33beta04 - September 19, 2017\ Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1979,7 +1979,6 @@ icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace, if (profile_length < 132) return png_icc_profile_error(png_ptr, colorspace, name, profile_length, "too short"); - return 1; } @@ -2214,13 +2213,9 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace, */ for (itag=0; itag < tag_count; ++itag, tag += 12) { - png_uint_32 tag_id = 0; - png_uint_32 tag_length = 0; - png_uint_32 tag_start = 0; - - tag_id = png_get_uint_32(tag+0); - tag_length = png_get_uint_32(tag+8);/* not padded */ - tag_start = png_get_uint_32(tag+4); /* must be aligned */ + png_uint_32 tag_id = png_get_uint_32(tag+0); + png_uint_32 tag_start = png_get_uint_32(tag+4); /* must be aligned */ + png_uint_32 tag_length = png_get_uint_32(tag+8);/* not padded */ /* The ICC specification does not exclude zero length tags, therefore the * start might actually be anywhere if there is no data, but this would be @@ -2238,7 +2233,7 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace, if ((tag_start & 3) != 0) { - /* CNHP730S.icc shipped with Microsoft Windows 64 violates this, it is + /* CNHP730S.icc shipped with Microsoft Windows 64 violates this; it is * only a warning here because libpng does not care about the * alignment. */ diff --git a/pngrutil.c b/pngrutil.c index 95e2b81c8..098b4e26d 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -671,7 +671,7 @@ png_decompress_chunk(png_structrp png_ptr, png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr, buffer_size)); /* attempt to stop an oss-fuzz "use of uninitialized value" - * in png_set_text_2() + * in png_set_text_2() and png_icc_check_tag_table() */ memset(text, 0, buffer_size); diff --git a/pngset.c b/pngset.c index bf63758f8..6f3a1ee11 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.6.33 [(PENDING RELEASE)] + * Last changed in libpng 1.6.32 [August 24, 2017] * Copyright (c) 1998-2017 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.) @@ -881,7 +881,6 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, } # endif - /* oss-fuzz detects potential use of uninitialized value here */ if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0') { text_length = 0; @@ -893,6 +892,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, # endif textp->compression = PNG_TEXT_COMPRESSION_NONE; } + else { text_length = strlen(text_ptr[i].text);