Merge branch 'libpng17' of ../../libpng into libpng17

4 files changed, 14 insertions, 14 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index e68c94d80..cac93df67 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta85 - October 2, 2016
+Libpng 1.7.0beta85 - December 27, 2016
 
 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.
@@ -1408,7 +1408,7 @@ Version 1.7.0beta84 [September 26, 2016]
   Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error().
   Add tests/badcrc.png and tests/badadler.png to tests/pngtest.
 
-Version 1.7.0beta85 [October 2, 2016]
+Version 1.7.0beta85 [December 27, 2016]
   Updated the documentation about CRC and ADLER32 handling.
   Quieted warnings from clang-3.8 in pngunknown.c and pngvalid.c.
 
diff --git a/CHANGES b/CHANGES
index 9232ffb63..f8df5c798 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5708,7 +5708,7 @@ Version 1.7.0beta84 [September 26, 2016]
   Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error().
   Add tests/badcrc.png and tests/badadler.png to tests/pngtest.
 
-Version 1.7.0beta85 [October 2, 2016]
+Version 1.7.0beta85 [December 27, 2016]
   Updated the documentation about CRC and ADLER32 handling.
   Quieted warnings from clang-3.8 in pngunknown.c and pngvalid.c.
 
diff --git a/png.c b/png.c
index 23ddc2915..07885fbe3 100644
--- a/png.c
+++ b/png.c
@@ -704,14 +704,14 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.7.0beta85 - September 26, 2016" PNG_STRING_NEWLINE \
+     "libpng version 1.7.0beta85 - December 27, 2016" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2002,2004,2006-2016 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.7.0beta85 - September 26, 2016\
+      return "libpng version 1.7.0beta85 - December 27, 2016\
       Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
diff --git a/pngrutil.c b/pngrutil.c
index bbed2a4d6..f3effdb6d 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -540,14 +540,14 @@ png_decompress_chunk(png_structrp png_ptr,
     */
    png_alloc_size_t limit = PNG_SIZE_MAX;
 
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-      if (png_ptr->user_chunk_malloc_max > 0 &&
-         png_ptr->user_chunk_malloc_max < limit)
-         limit = png_ptr->user_chunk_malloc_max;
-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
-      if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-         limit = PNG_USER_CHUNK_MALLOC_MAX;
-#  endif
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (png_ptr->user_chunk_malloc_max > 0 &&
+      png_ptr->user_chunk_malloc_max < limit)
+      limit = png_ptr->user_chunk_malloc_max;
+#elif PNG_USER_CHUNK_MALLOC_MAX > 0
+   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
+      limit = PNG_USER_CHUNK_MALLOC_MAX;
+#endif
 
    if (limit >= prefix_size + (terminate != 0))
    {
@@ -641,7 +641,7 @@ png_decompress_chunk(png_structrp png_ptr,
                    */
                   if (ret == Z_STREAM_END &&
                       chunklength - prefix_size != lzsize)
-                      png_chunk_benign_error(png_ptr, "extra compressed data");
+                     png_chunk_benign_error(png_ptr, "extra compressed data");
                }
 
                else