]> granicus.if.org Git - imagemagick/commitdiff
Also call png_set_chunk_malloc_max when png:chunk-malloc-max is not set to avoid...
authorDirk Lemstra <dirk@git.imagemagick.org>
Fri, 14 Sep 2018 07:59:20 +0000 (09:59 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Fri, 14 Sep 2018 07:59:20 +0000 (09:59 +0200)
coders/png.c

index 4ca72e9a6f68a4ba55a2a3a3eab5b16f78a74851..01af8de27ef6eeea3ab619c09aeb26bffa1c215f 100644 (file)
@@ -68,6 +68,7 @@
 #include "MagickCore/log.h"
 #include "MagickCore/MagickCore.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/memory-private.h"
 #include "MagickCore/module.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
@@ -2449,6 +2450,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
     if (option != (const char *) NULL)
       png_set_chunk_malloc_max(ping,(png_alloc_size_t) MagickMin(PNG_SIZE_MAX,
         StringToLong(option)));
+    else
+      png_set_chunk_malloc_max(ping,(png_alloc_size_t) GetMaxMemoryRequest());
 #endif
   }
 #endif /* PNG_SET_USER_LIMITS_SUPPORTED */