mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Revert change to png_malloc_array(). It's not needed

Browse Source 
now that iCCP profile_length honors PNG_USER_CHUNK_MALLOC_MAX.
This commit is contained in:
Glenn Randers-Pehrson 2016-08-10 22:26:12 -05:00
parent e018ab98be
commit 6bdaf38d12
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ANNOUNCE
View File

@ -26,8 +26,6 @@ Other information:
Changes since the last public release (1.6.24): Changes since the last public release (1.6.24):
Version 1.6.25beta01 [August 11, 2016] Version 1.6.25beta01 [August 11, 2016]
Return NULL from png_malloc_array() with a warning instead of calling
png_error() on failure.
Reject oversized iCCP profile immediately. Reject oversized iCCP profile immediately.
Cleaned up PNG_DEBUG compile of pngtest.c. Cleaned up PNG_DEBUG compile of pngtest.c.

2
CHANGES
View File

@ -5676,8 +5676,6 @@ Version 1.6.24[August 4, 2016]
No changes. No changes.
Version 1.6.25beta01 [August 11, 2016] Version 1.6.25beta01 [August 11, 2016]
Return NULL from png_malloc_array() with a warning instead of calling
png_error() on failure.
Reject oversized iCCP profile immediately. Reject oversized iCCP profile immediately.
Cleaned up PNG_DEBUG compile of pngtest.c. Cleaned up PNG_DEBUG compile of pngtest.c.

7
pngmem.c
View File

@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation /* pngmem.c - stub functions for memory allocation
* *
* Last changed in libpng 1.6.25 [(PENDING RELEASE)] * Last changed in libpng 1.6.24 [August 4, 2016]
* Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -123,10 +123,7 @@ png_malloc_array,(png_const_structrp png_ptr, int nelements,
size_t element_size),PNG_ALLOCATED) size_t element_size),PNG_ALLOCATED)
{ {
if (nelements <= 0 || element_size == 0) if (nelements <= 0 || element_size == 0)
{ png_error(png_ptr, "internal error: array alloc");
png_warning(png_ptr, "internal error: array alloc");
return NULL;
}
return png_malloc_array_checked(png_ptr, nelements, element_size); return png_malloc_array_checked(png_ptr, nelements, element_size);
} }