update to libpng 1.6.31

1 files changed, 54 insertions, 7 deletions

diff --git a/plugins/AdvaImg/src/LibPNG/pngrutil.c b/plugins/AdvaImg/src/LibPNG/pngrutil.c
index e377b3250f..afcebe40cb 100644
--- a/plugins/AdvaImg/src/LibPNG/pngrutil.c
+++ b/plugins/AdvaImg/src/LibPNG/pngrutil.c
@@ -1,7 +1,7 @@
 

 /* pngrutil.c - utilities to read a PNG file

  *

- * Last changed in libpng 1.6.29 [March 16, 2017]

+ * Last changed in libpng 1.6.31 [July 27, 2017]

  * Copyright (c) 1998-2002,2004,2006-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.)

@@ -2009,6 +2009,44 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 }

 #endif

 

+#ifdef PNG_READ_eXIf_SUPPORTED

+void /* PRIVATE */

+png_handle_eXIf(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

+{

+   unsigned int i;

+   png_bytep eXIf_buf;

+

+   png_debug(1, "in png_handle_eXIf");

+

+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)

+      png_chunk_error(png_ptr, "missing IHDR");

+

+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_eXIf) != 0)

+   {

+      png_crc_finish(png_ptr, length);

+      png_chunk_benign_error(png_ptr, "duplicate");

+      return;

+   }

+

+   eXIf_buf = png_voidcast(png_bytep,

+             png_malloc_warn(png_ptr, length));

+

+   for (i = 0; i < length; i++)

+   {

+      png_byte buf[1];

+      png_crc_read(png_ptr, buf, 1);

+      eXIf_buf[i] = buf[0];

+   }

+

+   if (png_crc_finish(png_ptr, 0) != 0)

+      return;

+

+   info_ptr->num_exif = length;

+

+   png_set_eXIf(png_ptr, info_ptr, eXIf_buf);

+}

+#endif

+

 #ifdef PNG_READ_hIST_SUPPORTED

 void /* PRIVATE */

 png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

@@ -2537,6 +2575,9 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)

       png_ptr->mode |= PNG_AFTER_IDAT;

 

+   /* Note, "length" is sufficient here; we won't be adding

+    * a null terminator later.

+    */

    buffer = png_read_buffer(png_ptr, length, 2/*silent*/);

 

    if (buffer == NULL)

@@ -2975,7 +3016,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
          case 2:

             png_ptr->user_chunk_cache_max = 1;

             png_chunk_benign_error(png_ptr, "no space in chunk cache");

-            /* FALL THROUGH */

+            /* FALLTHROUGH */

          case 1:

             /* NOTE: prior to 1.6.0 this case resulted in an unknown critical

              * chunk being skipped, now there will be a hard error below.

@@ -2984,7 +3025,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
 

          default: /* not at limit */

             --(png_ptr->user_chunk_cache_max);

-            /* FALL THROUGH */

+            /* FALLTHROUGH */

          case 0: /* no limit */

 #  endif /* USER_LIMITS */

             /* Here when the limit isn't reached or when limits are compiled

@@ -3377,7 +3418,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
                 */

                do

                {

-                  dp[0] = sp[0], dp[1] = sp[1];

+                  dp[0] = sp[0]; dp[1] = sp[1];

 

                   if (row_width <= bytes_to_jump)

                      return;

@@ -3398,7 +3439,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
                 */

                for (;;)

                {

-                  dp[0] = sp[0], dp[1] = sp[1], dp[2] = sp[2];

+                  dp[0] = sp[0]; dp[1] = sp[1]; dp[2] = sp[2];

 

                   if (row_width <= bytes_to_jump)

                      return;

@@ -3887,7 +3928,10 @@ png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row,
       /* Find the best predictor, the least of pa, pb, pc favoring the earlier

        * ones in the case of a tie.

        */

-      if (pb < pa) pa = pb, a = b;

+      if (pb < pa)

+      {

+         pa = pb; a = b;

+      }

       if (pc < pa) a = c;

 

       /* Calculate the current pixel in a, and move the previous row pixel to c

@@ -3939,7 +3983,10 @@ png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row,
       pc = (p + pc) < 0 ? -(p + pc) : p + pc;

 #endif

 

-      if (pb < pa) pa = pb, a = b;

+      if (pb < pa)

+      {

+         pa = pb; a = b;

+      }

       if (pc < pa) a = c;

 

       a += *row;