diff --git a/LICENSE b/LICENSE index cee241a23..d496790e5 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.33beta03, September 3, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.33beta03, September 14, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -130,4 +130,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 3, 2017 +September 14, 2017 diff --git a/README b/README index 7693ba083..38aa353a3 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.33beta03 - September 3, 2017 (shared library 16.0) +README for libpng version 1.6.33beta03 - September 14, 2017 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/contrib/oss-fuzz/libpng_read_fuzzer.cc b/contrib/oss-fuzz/libpng_read_fuzzer.cc index fd13bcdac..d39135d84 100644 --- a/contrib/oss-fuzz/libpng_read_fuzzer.cc +++ b/contrib/oss-fuzz/libpng_read_fuzzer.cc @@ -5,7 +5,7 @@ // Use of this source code is governed by a BSD-style license that may // be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE -// Last changed in libpng 1.6.33beta03 [September 5, 2017] +// Last changed in libpng 1.6.33beta03 [September 14, 2017] // The modifications in 2017 by Glenn Randers-Pehrson include // 1. addition of a PNG_CLEANUP macro, diff --git a/libpng-manual.txt b/libpng-manual.txt index 4bb876b57..791767a97 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.33beta03 - September 3, 2017 + libpng version 1.6.33beta03 - September 14, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.33beta03 - September 3, 2017 + libpng versions 0.97, January 1998, through 1.6.33beta03 - September 14, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 8341d74a3..44c8cb49c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "September 3, 2017" +.TH LIBPNG 3 "September 14, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.33beta03 .SH SYNOPSIS @@ -518,7 +518,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.33beta03 - September 3, 2017 + libpng version 1.6.33beta03 - September 14, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -529,7 +529,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.33beta03 - September 3, 2017 + libpng versions 0.97, January 1998, through 1.6.33beta03 - September 14, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -6081,7 +6081,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.33beta03 - September 3, 2017: +Libpng version 1.6.33beta03 - September 14, 2017: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6106,7 +6106,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.33beta03, September 3, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.33beta03, September 14, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -6234,7 +6234,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 3, 2017 +September 14, 2017 .\" end of man page diff --git a/png.c b/png.c index a70ca3dff..01abb2b9f 100644 --- a/png.c +++ b/png.c @@ -2226,7 +2226,7 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace, */ /* This is a hard error; potentially it can cause read outside the - * profile. + * profile. Oss-fuzz detects a potential UMR in tag_start reference. */ if (tag_start > profile_length || tag_length > profile_length - tag_start) return png_icc_profile_error(png_ptr, colorspace, name, tag_id, diff --git a/png.h b/png.h index 985b16b53..552fb4de8 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.33beta03, September 3, 2017 + * libpng version 1.6.33beta03, September 14, 2017 * * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.33beta03, September 3, 2017: + * libpng versions 0.97, January 1998, through 1.6.33beta03, September 14, 2017: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.33beta03, September 3, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.33beta03, September 14, 2017 are * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -241,7 +241,7 @@ * Y2K compliance in libpng: * ========================= * - * September 3, 2017 + * September 14, 2017 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -310,7 +310,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.33beta03" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta03 - September 3, 2017\n" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta03 - September 14, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index f5db2a8a7..085b7b86e 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.33beta03, September 3, 2017 + * libpng version 1.6.33beta03, September 14, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngset.c b/pngset.c index e622fdde5..165b7b496 100644 --- a/pngset.c +++ b/pngset.c @@ -881,7 +881,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, } # endif - /* oss-fuzz complains of UMR here */ + /* oss-fuzz detects a potential UMR here */ if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0') { text_length = 0; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index a9356a413..f1bc7c349 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.33beta03 - September 3, 2017 +libpng version 1.6.33beta03 - September 14, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index dc35de9d3..5cac0e74d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@