cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Revert use of png_malloc_array in iCCP chunk reader

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2016-08-12 06:58:15 -05:00
parent 8ff2ed2fe1
commit 935676cdad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pngrutil.c
View File

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