[libpng16] Bump version to 1.6.33beta01

ANNOUNCE

@@ -26,6 +26,7 @@ Other information:
 Changes since the last public release (1.6.32):
   Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing
     parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).
+  Free row_ptr in PNG_CLEANUP macro in contrib/oss-fuzz/libpng_read_fuzzer.cc
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

@@ -5997,6 +5997,7 @@ Version 1.6.32 [August 24, 2017]
 Version 1.6.33beta01 [August 28, 2017]
   Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing
     parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).
+  Free row_ptr in PNG_CLEANUP macro in contrib/oss-fuzz/libpng_read_fuzzer.cc
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

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.33beta01, August 25, 2017 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 28, 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

README

-README for libpng version 1.6.33beta01 - August 25, 2017 (shared library 16.0)
+README for libpng version 1.6.33beta01 - August 28, 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.

contrib/oss-fuzz/README.txt

@@ -23,10 +23,14 @@ The files are
                             Original
  Filename                   or derived   Copyright          License
  =========================  ==========   ================   ==========
- build.sh                   derived      2017, Glenn R-P    Apache 2.0
+ build.sh*                  derived      2017, Glenn R-P    Apache 2.0
  libpng_read_fuzzer.cc      derived      2017, Glenn R-P    Chromium
  libpng_read_fuzzer.options original     2015, Chrome Devs  Chromium
  png.dict                   original     2015, Chrome Devs  Chromium
- README.txt (this file)     original     2017, GLenn R-P    libpng
+ README.txt (this file)     original     2017, Glenn R-P    libpng
 
-To do: exercise the progressive reader.
+ * build.sh is a copy of the file used by oss-fuzz. png.dict and
+   libpng_read_fuzzer.* are the actual files used by oss-fuzz, which
+   retrieves them from the libpng repository at Github.
+
+To do: exercise the progressive reader and the png encoder.

contrib/oss-fuzz/build.sh

@@ -38,13 +38,13 @@ make -j$(nproc) libpng16.la
 
 # build libpng_read_fuzzer.
 $CXX $CXXFLAGS -std=c++11 -I. \
-     $SRC/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc -o \
-     $OUT/libpng_read_fuzzer \
+     $SRC/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc \
+     -o $OUT/libpng_read_fuzzer \
      -lFuzzingEngine .libs/libpng16.a -lz
 
 # add seed corpus.
-find $SRC/libpng/contrib/pngsuite -name "*.png" | \
-   xargs zip $OUT/libpng_read_fuzzer_seed_corpus.zip
+find $SRC/libpng -name "*.png" | \
+     xargs zip $OUT/libpng_read_fuzzer_seed_corpus.zip
 
-cp $SRC/libpng/contrib/oss-fuzz*.dict \
-   $SRC/libpng/contrib/oss-fuzz/*.options $OUT/
+cp $SRC/libpng/contrib/oss-fuzz/*.dict \
+     $SRC/libpng/contrib/oss-fuzz/*.options $OUT/

libpng-manual.txt

 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.33beta01 - August 25, 2017
+ libpng version 1.6.33beta01 - August 28, 2017
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  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.33beta01 - August 25, 2017
+ libpng versions 0.97, January 1998, through 1.6.33beta01 - August 28, 2017
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
 

libpng.3

-.TH LIBPNG 3 "August 25, 2017"
+.TH LIBPNG 3 "August 28, 2017"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.33beta01
 .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.33beta01 - August 25, 2017
+ libpng version 1.6.33beta01 - August 28, 2017
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  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.33beta01 - August 25, 2017
+ libpng versions 0.97, January 1998, through 1.6.33beta01 - August 28, 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.33beta01 - August 25, 2017:
+Libpng version 1.6.33beta01 - August 28, 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.33beta01, August 25, 2017 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 28, 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
-August 25, 2017
+August 28, 2017
 
 .\" end of man page
 

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.33beta01 - August 25, 2017" PNG_STRING_NEWLINE \
+      "libpng version 1.6.33beta01 - August 28, 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.33beta01 - August 25, 2017\
+   return "libpng version 1.6.33beta01 - August 28, 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.";

png.h

 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.33beta01, August 25, 2017
+ * libpng version 1.6.33beta01, August 28, 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.33beta01, August 25, 2017:
+ *   libpng versions 0.97, January 1998, through 1.6.33beta01, August 28, 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.33beta01, August 25, 2017 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.33beta01, August 28, 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:
  * =========================
  *
- *    August 25, 2017
+ *    August 28, 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.33beta01"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta01 - August 25, 2017\n"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta01 - August 28, 2017\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16

pngconf.h

 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.33beta01, August 25, 2017
+ * libpng version 1.6.33beta01, August 28, 2017
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

projects/vstudio/README.txt

 
 VisualStudio instructions
 
-libpng version 1.6.33beta01 - August 25, 2017
+libpng version 1.6.33beta01 - August 28, 2017
 
 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
 

projects/vstudio/zlib.props

@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.6.33beta01 - August 25, 2017
+ * libpng version 1.6.33beta01 - August 28, 2017
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *

scripts/README.txt

 
-Makefiles for  libpng version 1.6.33beta01 - August 25, 2017
+Makefiles for  libpng version 1.6.33beta01 - August 28, 2017
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile

scripts/pnglibconf.h.prebuilt

@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.33beta01 - August 25, 2017 */
+/* Libpng version 1.6.33beta01 - August 28, 2017 */
 
 /* Copyright (c) 1998-2017 Glenn Randers-Pehrson */