From 28b18aa7ff93cecbe7617797ad0713e570a2c81f Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 4 Dec 2014 00:19:57 +0000 Subject: [PATCH] Fix out of bound access in sun image handling It the merge of rev 17153 and rev 17155 Origin: http://trac.imagemagick.org/changeset/17153 and http://trac.imagemagick.org/changeset/17155 --- coders/sun.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coders/sun.c b/coders/sun.c index 02712d7..ac8aba5 100644 --- a/coders/sun.c +++ b/coders/sun.c @@ -520,8 +520,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception) bytes_per_pixel++; if (bytes_per_line == 0) bytes_per_line=bytes_per_pixel*image->columns; - length=image->rows*((bytes_per_line*image->columns)+image->columns % - 2); + length=image->rows*(bytes_per_line+image->columns % 2); if (((sun_info.type == RT_ENCODED) && (length > (bytes_per_line*image->rows))) || ((sun_info.type != RT_ENCODED) && (length > sun_info.length))) -- 2.1.4