]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Wed, 3 Apr 2019 11:52:38 +0000 (07:52 -0400)
committerCristy <urban-warrior@imagemagick.org>
Wed, 3 Apr 2019 11:52:38 +0000 (07:52 -0400)
coders/png.c
configure

index ab4e0a788a07d7510edcac6f3c49b0a0524cabc0..c3e5221849211f8c412a13d45ac3478ac7e38c22 100644 (file)
@@ -3790,7 +3790,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
     {
       png_destroy_read_struct(&ping,&ping_info,&end_info);
       pixel_info=RelinquishVirtualMemory(pixel_info);
-      image->colors=2;
+      if (AcquireImageColormap(image,2,exception) == MagickFalse)
+        ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
       (void) SetImageBackgroundColor(image,exception);
 #ifdef IMPNG_SETJMP_NOT_THREAD_SAFE
       UnlockSemaphoreInfo(ping_semaphore);
index e0a5078693ed523f6ae4b0ed81268a655261e471..92034d27b9fffa8522922e2d42d4fe5ec19e5fc2 100755 (executable)
--- a/configure
+++ b/configure
@@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=37
 
 MAGICK_VERSION=7.0.8-37
 
-MAGICK_GIT_REVISION=15465:d14ca1213:20190401
+MAGICK_GIT_REVISION=15466:323799794:20190403
 
 
 # Substitute library versioning