(no commit message)

diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index e5b53e206625ad92fc789879b7ca487c6200f326..ccf53f4945c6b6df005a84585c65c526bd4a6dc5 100644 (file)
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -131,14 +131,18 @@ MagickExport MagickBooleanType AcquireImageColormap(Image *image,
     image->colormap=(PixelInfo *) ResizeQuantumMemory(image->colormap,
       image->colors,sizeof(*image->colormap));
   if (image->colormap == (PixelInfo *) NULL)
-    ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
-      image->filename);
+    {
+      image->colors=0;
+      image->storage_class=DirectClass;
+      ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
+        image->filename);
+    }
   for (i=0; i < (ssize_t) image->colors; i++)
   {
     double
       pixel;
 
-    pixel=(double) (i*(QuantumRange/MagickMax(colors-1,1)));
+    pixel=(double) (i*(QuantumRange/(image->colors-1)));
     GetPixelInfo(image,image->colormap+i);
     image->colormap[i].alpha_trait=BlendPixelTrait;
     image->colormap[i].red=pixel;