]> granicus.if.org Git - imagemagick/commitdiff
Fixed null pointer dereference.
authordirk <dirk@git.imagemagick.org>
Mon, 25 May 2015 08:44:35 +0000 (08:44 +0000)
committerdirk <dirk@git.imagemagick.org>
Mon, 25 May 2015 08:44:35 +0000 (08:44 +0000)
MagickCore/pixel.c

index a16bcc383bbbe50617252b286e51ce71952809c1..64b1e3acc9889a01653aef9fbab50341e240d776 100644 (file)
@@ -2232,11 +2232,13 @@ MagickExport MagickRealType GetPixelInfoIntensity(const Image *restrict image,
     method;
 
   method=Rec709LumaPixelIntensityMethod;
-  if (image != (const Image *) NULL)
-    method=image->intensity;
   gamma=1.0;
-  if (image->alpha_trait != UndefinedPixelTrait)
-    gamma=PerceptibleReciprocal(QuantumScale*pixel->alpha);
+  if (image != (const Image *) NULL)
+    {
+      method=image->intensity;
+      if (image->alpha_trait != UndefinedPixelTrait)
+        gamma=PerceptibleReciprocal(QuantumScale*pixel->alpha);
+    }
   red=gamma*pixel->red;
   green=gamma*pixel->green;
   blue=gamma*pixel->blue;