From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 16 Sep 2018 15:26:53 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.8-12~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f613ec255bb69b3e1fa8fddcbe1cdcf4c8a6612;p=imagemagick

...
---

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 869270985..0658d0913 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -4051,32 +4051,34 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
   if (caption != (const char *) NULL)
     {
       char
-        geometry[MagickPathExtent],
         *text;
 
-      DrawInfo
-        *annotate_info;
-
-      MagickBooleanType
-        status;
-
-      ssize_t
-        count;
-
-      TypeMetric
-        metrics;
-
       /*
         Generate caption image.
       */
       caption_image=CloneImage(image,image->columns,1,MagickTrue,exception);
       if (caption_image == (Image *) NULL)
         return((Image *) NULL);
-      annotate_info=CloneDrawInfo((const ImageInfo *) NULL,draw_info);
       text=InterpretImageProperties((ImageInfo *) NULL,(Image *) image,caption,
         exception);
       if (text != (char *) NULL)
         {
+          char
+            geometry[MagickPathExtent];
+
+          DrawInfo
+            *annotate_info;
+
+          MagickBooleanType
+            status;
+
+          ssize_t
+            count;
+
+          TypeMetric
+            metrics;
+
+          annotate_info=CloneDrawInfo((const ImageInfo *) NULL,draw_info);
           (void) CloneString(&annotate_info->text,text);
           count=FormatMagickCaption(caption_image,annotate_info,MagickTrue,
             &metrics,&text,exception);
@@ -4097,9 +4099,9 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
               (void) AnnotateImage(caption_image,annotate_info,exception);
               height+=caption_image->rows;
             }
+          annotate_info=DestroyDrawInfo(annotate_info);
           text=DestroyString(text);
         }
-      annotate_info=DestroyDrawInfo(annotate_info);
     }
   picture_image=CloneImage(image,image->columns+2*quantum,height,MagickTrue,
     exception);