File libpng16-CVE-2017-12652.patch of Package libpng16.10963

Overview Repositories Revisions Requests Users Attributes Meta

File libpng16-CVE-2017-12652.patch of Package libpng16.10963 (Revision a4ed921803e2bd2b55cad28b3459bc0b)

Currently displaying revision a4ed921803e2bd2b55cad28b3459bc0b , Show latest

Index: libpng-1.6.8/pngpread.c
===================================================================
--- libpng-1.6.8.orig/pngpread.c	2019-07-17 13:32:08.735353477 +0200
+++ libpng-1.6.8/pngpread.c	2019-07-17 13:32:08.819353925 +0200
@@ -212,6 +212,7 @@ png_push_read_chunk(png_structrp png_ptr
       png_crc_read(png_ptr, chunk_tag, 4);
       png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
       png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+      png_check_chunk_length(png_ptr, png_ptr->push_length);
       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
    }
 
Index: libpng-1.6.8/pngrutil.c
===================================================================
--- libpng-1.6.8.orig/pngrutil.c	2019-07-17 13:32:08.771353669 +0200
+++ libpng-1.6.8/pngrutil.c	2019-07-17 13:32:08.819353925 +0200
@@ -175,6 +175,9 @@ png_read_chunk_header(png_structrp png_p
    /* Check to see if chunk name is valid. */
    png_check_chunk_name(png_ptr, png_ptr->chunk_name);
 
+   /* Check for too-large chunk length */
+   png_check_chunk_length(png_ptr, length);
+
 #ifdef PNG_IO_STATE_SUPPORTED
    png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;
 #endif
@@ -3004,6 +3007,43 @@ png_check_chunk_name(png_structrp png_pt
    }
 }
 
+void /* PRIVATE */
+png_check_chunk_length(png_const_structrp png_ptr, const png_uint_32 length)
+{
+   png_alloc_size_t limit = PNG_UINT_31_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
+   if (png_ptr->chunk_name == png_IDAT)
+   {
+      png_alloc_size_t idat_limit = PNG_UINT_31_MAX;
+      size_t row_factor =
+         ((size_t)png_ptr->width * (size_t)png_ptr->channels * (png_ptr->bit_depth > 8? 2: 1)
+          + 1 + (png_ptr->interlaced? 6: 0));
+      if (png_ptr->height > PNG_UINT_32_MAX/row_factor)
+         idat_limit=PNG_UINT_31_MAX;
+      else
+         idat_limit = png_ptr->height * row_factor;
+      row_factor = row_factor > 32566? 32566 : row_factor;
+      idat_limit += 6 + 5*(idat_limit/row_factor+1); /* zlib+deflate overhead */
+      idat_limit=idat_limit < PNG_UINT_31_MAX? idat_limit : PNG_UINT_31_MAX;
+      limit = limit < idat_limit? idat_limit : limit;
+   }
+
+   if (length > limit)
+   {
+      png_debug2(0," length = %lu, limit = %lu",
+         (unsigned long)length,(unsigned long)limit);
+      png_chunk_error(png_ptr, "chunk data is too large");
+   }
+}
+
 /* Combines the row recently read in with the existing pixels in the row.  This
  * routine takes care of alpha and transparency if requested.  This routine also
  * handles the two methods of progressive display of interlaced images,
Index: libpng-1.6.8/pngpriv.h
===================================================================
--- libpng-1.6.8.orig/pngpriv.h	2013-12-19 16:04:50.000000000 +0100
+++ libpng-1.6.8/pngpriv.h	2019-07-17 13:33:57.499934542 +0200
@@ -1470,6 +1470,9 @@ PNG_INTERNAL_FUNCTION(void,png_handle_zT
 PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_structrp png_ptr,
     png_uint_32 chunk_name),PNG_EMPTY);
 
+PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr,
+    const png_uint_32 chunk_length),PNG_EMPTY);
+
 PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
     png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
    /* This is the function that gets called for unknown chunks.  The 'keep'

Places

File libpng16-CVE-2017-12652.patch of Package libpng16.10963 (Revision a4ed921803e2bd2b55cad28b3459bc0b)

Places