From b76ab1260d156a390a47f81c0ea6ef0524208b8e Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sun, 9 Dec 2012 17:08:13 -0600
Subject: [PATCH] [libpng16] Fixed typo in png.c (PNG_SET_CHUNK_MALLOC_MAX
 should be

PNG_CHUNK_MALLOC_MAX) that causes the MALLOC_MAX limit not to work (John Bowler)
---
 ANNOUNCE | 20 ++++++++++++--------
 CHANGES  |  4 ++++
 png.c    |  8 ++++----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index f23f5718b..59d01d680 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.0beta32 - November 25, 2012
+Libpng 1.6.0beta33 - December 9, 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.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.6.0beta32.tar.xz (LZMA-compressed, recommended)
-   1.6.0beta32.tar.gz
-   1.6.0beta32.tar.bz2
+   1.6.0beta33.tar.xz (LZMA-compressed, recommended)
+   1.6.0beta33.tar.gz
+   1.6.0beta33.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp160b32.7z  (LZMA-compressed, recommended)
-   lp160b32.zip
+   lp160b33.7z  (LZMA-compressed, recommended)
+   lp160b33.zip
 
 Other information:
 
-   1.6.0beta32-README.txt
-   1.6.0beta32-LICENSE.txt
+   1.6.0beta33-README.txt
+   1.6.0beta33-LICENSE.txt
 
 Changes since the last public release (1.5.7):
 
@@ -552,6 +552,10 @@ Version 1.6.0beta32 [November 25, 2012]
   Fixed error checking in the simplified write API (Olaf van der Spek)
   Made png_user_version_check() ok to use with libpng version 1.10.x and later.
 
+Version 1.6.0beta33 [December 9, 2012]
+  Fixed typo in png.c (PNG_SET_CHUNK_MALLOC_MAX should be PNG_CHUNK_MALLOC_MAX)
+    that causes the MALLOC_MAX limit not to work (John Bowler)
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index ab8596e4f..2c573e475 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4304,6 +4304,10 @@ Version 1.6.0beta32 [November 25, 2012]
   Fixed error checking in the simplified write API (Olaf van der Spek)
   Made png_user_version_check() ok to use with libpng version 1.10.x and later.
 
+Version 1.6.0beta33 [December 9, 2012]
+  Fixed typo in png.c (PNG_SET_CHUNK_MALLOC_MAX should be PNG_CHUNK_MALLOC_MAX)
+    that causes the MALLOC_MAX limit not to work (John Bowler)
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/png.c b/png.c
index c2c231fb7..1fac44ade 100644
--- a/png.c
+++ b/png.c
@@ -14,7 +14,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_0beta32 Your_png_h_is_not_version_1_6_0beta32;
+typedef png_libpng_version_1_6_0beta33 Your_png_h_is_not_version_1_6_0beta33;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -246,7 +246,7 @@ png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
          create_struct.user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
 #     endif
 
-#     ifdef PNG_SET_USER_CHUNK_MALLOC_MAX
+#     ifdef PNG_USER_CHUNK_MALLOC_MAX
          /* Added at libpng-1.2.43 and 1.4.1, required only for read but exists
           * in png_struct regardless.
           */
@@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.6.0beta32 - November 25, 2012" PNG_STRING_NEWLINE \
+     "libpng version 1.6.0beta33 - December 9, 2012" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2012 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.0beta32 - November 25, 2012\
+      return "libpng version 1.6.0beta33 - December 9, 2012\
       Copyright (c) 1998-2012 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
-- 
GitLab