From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 1 Mar 2018 12:25:49 +0000 (-0500)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6616
X-Git-Tag: 7.0.7-25~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1fb7816a60c7c68d7ac037975c5aa95b6dcf8dd;p=imagemagick

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

diff --git a/MagickCore/property.c b/MagickCore/property.c
index ac3494c15..66470643a 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2775,7 +2775,8 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info,
         Image signature.
       */
       WarnNoImageReturn("\"%%%c\"",letter);
-      (void) SignatureImage(image,exception);
+      if ((image->columns != 0) && (image->rows != 0))
+        (void) SignatureImage(image,exception);
       string=GetImageProperty(image,"signature",exception);
       break;
     }
diff --git a/coders/label.c b/coders/label.c
index e4b9b707d..4ae206b28 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -124,6 +124,8 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
   assert(exception->signature == MagickCoreSignature);
   image=AcquireImage(image_info,exception);
   (void) ResetImagePage(image,"0x0+0+0");
+  if ((image->columns != 0) && (image->rows != 0))
+    (void) SetImageBackgroundColor(image,exception);
   property=InterpretImageProperties((ImageInfo *) image_info,image,
     image_info->filename,exception);
   if (property == (char *) NULL)
@@ -240,7 +242,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
     Draw label.
   */
   (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
-    draw_info->direction == RightToLeftDirection ? image->columns-
+    draw_info->direction == RightToLeftDirection ? (double) image->columns-
     metrics.bounds.x2 : 0.0,draw_info->gravity == UndefinedGravity ?
     metrics.ascent : 0.0);
   (void) CloneString(&draw_info->geometry,geometry);