(no commit message)

diff --git a/MagickCore/color.c b/MagickCore/color.c
index 0937beb1e8a8925d200111bf635988c8442bc5b4..81a2ead58ed09089954f51d832e37a7343d060fa 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -46,6 +46,7 @@
 #include "MagickCore/cache.h"
 #include "MagickCore/color.h"
 #include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
 #include "MagickCore/client.h"
 #include "MagickCore/configure.h"
 #include "MagickCore/exception.h"
@@ -2591,8 +2592,8 @@ MagickExport MagickBooleanType QueryMagickColor(const char *name,
 %
 */
 MagickExport MagickBooleanType QueryMagickColorname(const Image *image,
-  const PixelInfo *color,const ComplianceType compliance,
-  char *name,ExceptionInfo *exception)
+  const PixelInfo *color,const ComplianceType compliance,char *name,
+  ExceptionInfo *exception)
 {
   PixelInfo
     pixel;
@@ -2612,6 +2613,8 @@ MagickExport MagickBooleanType QueryMagickColorname(const Image *image,
     }
   GetColorTuple(&pixel,compliance != SVGCompliance ? MagickTrue : MagickFalse,
     name);
+  if (IsRGBColorspace(pixel.colorspace) == MagickFalse)
+    return(MagickFalse);
   (void) GetColorInfo("*",exception);
   ResetLinkedListIterator(color_list);
   opacity=image->matte != MagickFalse ? color->alpha : OpaqueAlpha;

diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 152c0197487f7bfe39b825030427bb68b8579f66..ac58a0eff63b914ec7de995415929cd15d282e3e 100644 (file)
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -66,8 +66,7 @@ static inline MagickBooleanType IsGrayColorspace(
   return(MagickFalse);
 }
 
-static inline MagickBooleanType IsRGBColorspace(
-  const ColorspaceType colorspace)
+static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace)
 {
   if ((IsGrayColorspace(colorspace) != MagickFalse) ||
       (colorspace == RGBColorspace) || (colorspace == TransparentColorspace))

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 1cc614c7f81a05283b28623eaa177964c4dd79f5..5810cace4f4b3d8792df7cae2008ac49c29288f5 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1711,6 +1711,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
     length;
 
   canonical=MagickFalse;
+  length=0;
   (void) CopyMagickString(filename,format,MaxTextExtent);
   for (p=strchr(format,'%'); p != (char *) NULL; p=strchr(p+1,'%'))
   {