From: Cristy <mikayla-grace@urban-warrior.org>
Date: Mon, 8 Apr 2019 22:36:29 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1540
X-Git-Tag: 7.0.8-40~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c111ed9b035532c2c81ea569f2d22fded9517287;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1540
---

diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index b5fb316ef..55158aa1a 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -3328,11 +3328,11 @@ static MagickBooleanType SetGrayscaleImage(Image *image,
   if (image->type != GrayscaleType)
     (void) TransformImageColorspace(image,GRAYColorspace,exception);
   if (image->storage_class == PseudoClass)
-    colormap_index=(ssize_t *) AcquireQuantumMemory(image->colors+1,
-      sizeof(*colormap_index));
+    colormap_index=(ssize_t *) AcquireQuantumMemory(MagickMax(image->colors+1,
+      MaxMap),sizeof(*colormap_index));
   else
-    colormap_index=(ssize_t *) AcquireQuantumMemory(MaxColormapSize+1,
-      sizeof(*colormap_index));
+    colormap_index=(ssize_t *) AcquireQuantumMemory(MagickMax(MaxColormapSize+1,
+      MaxMap),sizeof(*colormap_index));
   if (colormap_index == (ssize_t *) NULL)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);