From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 20 Dec 2017 16:44:50 +0000 (-0500)
Subject: https://github.com/ImageMagick/ImageMagick/issues/904
X-Git-Tag: 7.0.7-16~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7649e96a7730dd116afb629b372c5772be0b900;p=imagemagick

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

diff --git a/MagickWand/montage.c b/MagickWand/montage.c
index d4263a74f..5bf6771e4 100644
--- a/MagickWand/montage.c
+++ b/MagickWand/montage.c
@@ -267,6 +267,8 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
 { \
   if (montage_image != (Image *) NULL) \
     montage_image=DestroyImageList(montage_image); \
+  if (montage_info != (MontageInfo *) NULL) \
+    montage_info=DestroyMontageInfo(montage_info); \
   DestroyImageStack(); \
   for (i=0; i < (ssize_t) argc; i++) \
     argv[i]=DestroyString(argv[i]); \
@@ -1785,7 +1787,8 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
       /*
         Write image.
       */
-      (void) CopyMagickString(image_info->filename,argv[argc-1],MagickPathExtent);
+      (void) CopyMagickString(image_info->filename,argv[argc-1],
+        MagickPathExtent);
       (void) CopyMagickString(montage_image->magick_filename,argv[argc-1],
         MagickPathExtent);
       if (*montage_image->magick == '\0')
@@ -1806,7 +1809,6 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
           text=DestroyString(text);
         }
     }
-  montage_info=DestroyMontageInfo(montage_info);
   DestroyMontage();
   return(status != 0 ? MagickTrue : MagickFalse);
 }