From: dirk <dirk@git.imagemagick.org>
Date: Mon, 25 May 2015 08:44:35 +0000 (+0000)
Subject: Fixed null pointer dereference.
X-Git-Tag: 7.0.1-0~996
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fff909e8b194dd94c6394df004685c583fe6808b;p=imagemagick

Fixed null pointer dereference.
---

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index a16bcc383..64b1e3acc 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -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;