[libpng16] Revert use of png_malloc_array in iCCP chunk reader

pngrutil.c

@@ -307,7 +307,7 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
 
    if (buffer == NULL)
    {
-      buffer = png_voidcast(png_bytep, png_malloc_array(png_ptr, 1, new_size));
+      buffer = png_voidcast(png_bytep, png_malloc_base(png_ptr, new_size));
 
       if (buffer != NULL)
       {
@@ -1462,7 +1462,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                         const png_uint_32 tag_count = png_get_uint_32(
                             profile_header+128);
                         png_bytep profile = png_read_buffer(png_ptr,
-                            profile_length, 1/*warn*/);
+                            profile_length, 2/*silent*/);
 
                         if (profile != NULL)
                         {
@@ -1528,8 +1528,8 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                                            PNG_FREE_ICCP, 0);
 
                                        info_ptr->iccp_name = png_voidcast(char*,
-                                           png_malloc_array(png_ptr,
-                                           keyword_length+1, 1));
+                                           png_malloc_base(png_ptr,
+                                           keyword_length+1));
                                        if (info_ptr->iccp_name != NULL)
                                        {
                                           memcpy(info_ptr->iccp_name, keyword,