[libpng16] Revert using png_malloc_array in iCCP chunk handling

This commit is contained in:
Glenn Randers-Pehrson
2016-08-12 06:35:25 -05:00
parent 8ff2ed2fe1
commit 8d9991d2db

View File

@@ -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)
{
@@ -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,