(no commit message)

diff --git a/coders/sun.c b/coders/sun.c
index a00d16c1c54c437c8a5b8349b40f52dcfea8d93c..86ec0bc126492b53426635cd2007962cbf7b32a4 100644 (file)
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -534,8 +534,9 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
           bytes_per_pixel=3;
           if (image->alpha_trait == BlendPixelTrait)
             bytes_per_pixel++;
-          length=image->rows*((bytes_per_line*image->columns)+
-            image->columns % 2);
+          if (bytes_per_line == 0)
+            bytes_per_line=bytes_per_pixel*image->columns;
+          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)))