summaryrefslogtreecommitdiff
path: root/pngmem.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2006-11-16 20:51:41 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:11:55 -0500
commitb5bfcbae5934b8d39dd3ab7a713bee185628f196 (patch)
treeee09bde5d4d155930509f82908ed070fb2241dd1 /pngmem.c
parentefe95a6953205daffa287ad34ff4cf5380f4b152 (diff)
downloadlibpng-b5bfcbae5934b8d39dd3ab7a713bee185628f196.tar.gz
Imported from libpng-1.2.14beta1.tarv1.2.14beta1
Diffstat (limited to 'pngmem.c')
-rw-r--r--pngmem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pngmem.c b/pngmem.c
index 45065f855..248060f38 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -541,9 +541,10 @@ png_voidp PNGAPI
png_malloc_warn(png_structp png_ptr, png_uint_32 size)
{
png_voidp ptr;
+ png_uint_32 save_flags;
if(png_ptr == NULL) return (NULL);
- png_uint_32 save_flags=png_ptr->flags;
+ save_flags=png_ptr->flags;
png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
png_ptr->flags=save_flags;