From: Cristy <mikayla-grace@urban-warrior.org>
Date: Sat, 23 Mar 2019 20:18:39 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1515
X-Git-Tag: 7.0.8-35~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4dd4d266f2d450a2996abf5294671d888991132;p=imagemagick

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

diff --git a/coders/pango.c b/coders/pango.c
index fd9040bc4..5f9118738 100644
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -201,8 +201,11 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     else
       property=InterpretImageProperties((ImageInfo *) image_info,image,option,
         exception);
-  (void) SetImageProperty(image,"caption",property,exception);
-  property=DestroyString(property);
+  if (property != (char *) NULL)
+    {
+      (void) SetImageProperty(image,"caption",property,exception);
+      property=DestroyString(property);
+    }
   caption=ConstantString(GetImageProperty(image,"caption",exception));
   /*
     Get context.
diff --git a/coders/vid.c b/coders/vid.c
index 5aa4b0941..dd57930a3 100644
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -176,8 +176,11 @@ static Image *ReadVIDImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     label=InterpretImageProperties((ImageInfo *) image_info,next_image,
       DefaultTileLabel,exception);
-    (void) SetImageProperty(next_image,"label",label,exception);
-    label=DestroyString(label);
+    if (label != (char *) NULL)
+      {
+        (void) SetImageProperty(next_image,"label",label,exception);
+        label=DestroyString(label);
+      }
     if (image_info->debug != MagickFalse)
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
         "geometry: %.20gx%.20g",(double) next_image->columns,(double)