From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 9 Feb 2018 01:07:47 +0000 (-0500)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6152
X-Git-Tag: 7.0.7-23~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93a9ccc85bd62b21bc4246fc6a8c2b7a32f8d678;p=imagemagick

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6152
---

diff --git a/coders/caption.c b/coders/caption.c
index 3dc16636e..0d8351e2b 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -149,6 +149,8 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
     else
       property=InterpretImageProperties((ImageInfo *) image_info,image,option,
         exception);
+  if (property == (char *) NULL)
+    return((Image *) NULL);
   (void) SetImageProperty(image,"caption",property,exception);
   property=DestroyString(property);
   caption=ConstantString(GetImageProperty(image,"caption",exception));
diff --git a/coders/label.c b/coders/label.c
index 60d00e3ff..6fdc1c587 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -126,6 +126,8 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
   (void) ResetImagePage(image,"0x0+0+0");
   property=InterpretImageProperties((ImageInfo *) image_info,image,
     image_info->filename,exception);
+  if (property == (char *) NULL)
+    return((Image *) NULL);
   (void) SetImageProperty(image,"label",property,exception);
   property=DestroyString(property);
   label=GetImageProperty(image,"label",exception);