]> granicus.if.org Git - imagemagick/commitdiff
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6152
authorCristy <urban-warrior@imagemagick.org>
Fri, 9 Feb 2018 00:56:31 +0000 (19:56 -0500)
committerCristy <urban-warrior@imagemagick.org>
Fri, 9 Feb 2018 00:56:31 +0000 (19:56 -0500)
MagickCore/property.c
coders/caption.c
coders/label.c

index b06d80be2403be45d9f4e936a8ca8dcc223f077c..94f3105e0009b8cb2a7e182f4d28d6f025988d18 100644 (file)
@@ -2520,7 +2520,8 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info,
 
       WarnNoImageReturn("\"%%%c\"",letter);
       colorspace=image->colorspace;
-      if (SetImageGray(image,exception) != MagickFalse)
+      if ((image->columns != 0) && (image->rows != 0) &&
+          (SetImageGray(image,exception) != MagickFalse))
         colorspace=GRAYColorspace;   /* FUTURE: this is IMv6 not IMv7 */
       (void) FormatLocaleString(value,MagickPathExtent,"%s %s %s",
         CommandOptionToMnemonic(MagickClassOptions,(ssize_t)
index e0cc5fc54135cb14493b9821e35dba91132cd175..3dc16636e5ccf61d56c14d41edaffd577e4d1005 100644 (file)
@@ -134,9 +134,6 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
   image=AcquireImage(image_info,exception);
-  image->columns=1;
-  image->rows=1;
-  (void) SetImageBackgroundColor(image,exception);
   (void) ResetImagePage(image,"0x0+0+0");
   /*
     Format caption.
@@ -152,9 +149,6 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
     else
       property=InterpretImageProperties((ImageInfo *) image_info,image,option,
         exception);
-  image=DestroyImage(image);
-  image=AcquireImage(image_info,exception);
-  (void) ResetImagePage(image,"0x0+0+0");
   (void) SetImageProperty(image,"caption",property,exception);
   property=DestroyString(property);
   caption=ConstantString(GetImageProperty(image,"caption",exception));
index c1567b00a21a90a48cb6df9277f95f6415b3f6e5..60d00e3ff2bb6151cd09a31c8ad3ca31751c045a 100644 (file)
@@ -123,15 +123,9 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
   image=AcquireImage(image_info,exception);
-  image->columns=1;
-  image->rows=1;
-  (void) SetImageBackgroundColor(image,exception);
   (void) ResetImagePage(image,"0x0+0+0");
   property=InterpretImageProperties((ImageInfo *) image_info,image,
     image_info->filename,exception);
-  image=DestroyImage(image);
-  image=AcquireImage(image_info,exception);
-  (void) ResetImagePage(image,"0x0+0+0");
   (void) SetImageProperty(image,"label",property,exception);
   property=DestroyString(property);
   label=GetImageProperty(image,"label",exception);