From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 21 Jul 2018 11:26:09 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1217
X-Git-Tag: 7.0.8-8~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=889e3e4c9d4feec83aa57a720f4a7f80c3df4db3;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1217
---

diff --git a/ChangeLog b/ChangeLog
index c984df1ff..b32a9faa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-20  7.0.8-8 Cristy  <quetzlzacatenango@image...>
+  * Non-HDRI ScaleLongToQuantum() private method no longer adds a half interval.
+  * Fixed memset() negative-size-param (reference
+    https://github.com/ImageMagick/ImageMagick/issues/1217).
+
 2018-07-16  7.0.8-7 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-7, GIT revision 14561:f85c23180:20180716.
 
diff --git a/coders/sgi.c b/coders/sgi.c
index 374eb2d32..ce051a10b 100644
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -262,6 +262,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
     status;
 
   MagickSizeType
+    n,
     number_pixels;
 
   MemoryInfo
@@ -390,8 +391,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (pixel_info == (MemoryInfo *) NULL)
       ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     pixels=(unsigned char *) GetVirtualMemoryBlob(pixel_info);
-    (void) memset(pixels,0,iris_info.columns*iris_info.rows*4*
-      bytes_per_pixel*sizeof(*pixels));
+    for (n=0; n < (4*bytes_per_pixel*number_pixels); n++)
+      pixels[n]=0;
     if ((int) iris_info.storage != 0x01)
       {
         unsigned char