]> granicus.if.org Git - imagemagick/commitdiff
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6616
authorCristy <urban-warrior@imagemagick.org>
Thu, 1 Mar 2018 12:25:49 +0000 (07:25 -0500)
committerCristy <urban-warrior@imagemagick.org>
Thu, 1 Mar 2018 12:25:49 +0000 (07:25 -0500)
MagickCore/property.c
coders/label.c

index ac3494c15cf18bfbb43c5af3a09d251bef776030..66470643a7a2f54789080ad64070565106f82056 100644 (file)
@@ -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;
     }
index e4b9b707dcde6ee0ec643c5455970520c139cd92..4ae206b282508547a01246f8905847224339822c 100644 (file)
@@ -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);