From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 2 Sep 2018 11:38:05 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.8-12~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c7eb855afb90ad70b7fbe69a37239a0fbfc1648;p=imagemagick

...
---

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 333f87cef..eb808616b 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -411,10 +411,10 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
   assert(exception->signature == MagickCoreSignature);
   number_images=GetImageListLength(images);
   master_list=ImageListToArray(images,exception);
+  if (master_list == (Image **) NULL)
+    return((Image *) NULL);
   image_list=master_list;
   image=image_list[0];
-  if (master_list == (Image **) NULL)
-    ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
   thumbnail=NewImageList();
   for (i=0; i < (ssize_t) number_images; i++)
   {