From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 27 Jan 2018 02:06:17 +0000 (-0500)
Subject: Eliminate heap-buffer-overflow in PushLongPixel()
X-Git-Tag: 7.0.7-23~274
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32d11ccf83b8b10b9f125761607dd58f88a99d39;p=imagemagick

Eliminate heap-buffer-overflow in PushLongPixel()
Credit OSS Fuzz
---

diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index c3d763211..ca7d06a3f 100644
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -2130,9 +2130,9 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info,
                 p+=quantum_info->pad;
                 q+=GetPixelChannels(image);
               }
-              p=PushLongPixel(quantum_info->endian,p,&pixel);
               if (x++ < (ssize_t) (number_pixels-1))
                 {
+                  p=PushLongPixel(quantum_info->endian,p,&pixel);
                   SetPixelGray(image,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
                     range),q);
                   q+=GetPixelChannels(image);