summaryrefslogtreecommitdiff
path: root/pngmem.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2016-08-10 22:26:12 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2016-08-10 22:26:12 -0500
commit6bdaf38d1283bc6436f6887c656030fde798aee3 (patch)
treec4085113a61641a9877780e1c8b0c84557e65aef /pngmem.c
parente018ab98bea53daa79602660dc80d02f1d99dc0e (diff)
[libpng16] Revert change to png_malloc_array(). It's not needed
now that iCCP profile_length honors PNG_USER_CHUNK_MALLOC_MAX.
Diffstat (limited to 'pngmem.c')
-rw-r--r--pngmem.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/pngmem.c b/pngmem.c
index bbe4241fa..6033bf2f5 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
/* 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
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (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)
{
if (nelements <= 0 || element_size == 0)
- {
- png_warning(png_ptr, "internal error: array alloc");
- return NULL;
- }
+ png_error(png_ptr, "internal error: array alloc");
return png_malloc_array_checked(png_ptr, nelements, element_size);
}