From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 15 Dec 2014 02:51:28 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1643
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffbd56072d21e08b5c50050e13ae20a1f9496a41;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 2e54fe8a6..19ce17d05 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3396,7 +3396,8 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
     packet_size+=cache_info->metacontent_extent;
   length=number_pixels*packet_size;
   columns=(size_t) (length/cache_info->rows/packet_size);
-  if (cache_info->columns != columns)
+  if ((cache_info->columns != columns) || ((ssize_t) cache_info->columns < 0) ||
+      ((ssize_t) cache_info->rows < 0))
     ThrowBinaryException(ResourceLimitError,"PixelCacheAllocationFailed",
       image->filename);
   cache_info->length=length;