From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 6 Jan 2015 12:13:31 +0000 (+0000)
Subject: http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26838
X-Git-Tag: 7.0.1-0~1491
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78f82d9d1c2944725a279acd573a22168dc6e22a;p=imagemagick

http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26838
---

diff --git a/coders/sun.c b/coders/sun.c
index 3fb0b7765..a25eae628 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -423,8 +423,9 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if ((sun_info.type != RT_ENCODED) && (sun_info.depth >= 8) &&
         ((number_pixels*((sun_info.depth+7)/8)) > sun_info.length))
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
-    sun_data=(unsigned char *) AcquireQuantumMemory((size_t) sun_info.length,
-      sizeof(*sun_data));
+    bytes_per_line=sun_info.width*sun_info.depth;
+    sun_data=(unsigned char *) AcquireQuantumMemory((size_t) MagickMax(
+      sun_info.length,bytes_per_line*sun_info.width),sizeof(*sun_data));
     if (sun_data == (unsigned char *) NULL)
       ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     count=(ssize_t) ReadBlob(image,sun_info.length,sun_data);
@@ -441,7 +442,6 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
           Read run-length encoded raster pixels.
         */
         height=sun_info.height;
-        bytes_per_line=sun_info.width*sun_info.depth;
         if ((height == 0) || (sun_info.width == 0) || (sun_info.depth == 0) ||
             ((bytes_per_line/sun_info.depth) != sun_info.width))
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");