From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 4 Sep 2011 23:02:10 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7086
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e27517ab7046a863240130753b159fc86549896a;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index d24a07a57..fc6f2adbd 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -4381,9 +4381,9 @@ MagickPrivate Quantum *QueueAuthenticNexus(Image *image,const ssize_t x,
   assert(image->signature == MagickSignature);
   assert(image->cache != (Cache) NULL);
   cache_info=(CacheInfo *) GetImagePixelCache(image,MagickTrue,exception);
-  assert(cache_info->signature == MagickSignature);
   if (cache_info == (Cache) NULL)
     return((Quantum *) NULL);
+  assert(cache_info->signature == MagickSignature);
   if ((cache_info->columns == 0) && (cache_info->rows == 0))
     {
       (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 9ab20151a..8a112fe38 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -636,8 +636,8 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
     */
     (void) CopyMagickString(montage->filename,montage_info->filename,
       MaxTextExtent);
-    montage->columns=bounds.width;
-    montage->rows=bounds.height;
+    montage->columns=MagickMax(bounds.width,1);
+    montage->rows=MagickMax(bounds.height,1);
     (void) SetImageBackgroundColor(montage);
     /*
       Set montage geometry.