From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 8 Feb 2017 18:37:13 +0000 (-0500)
Subject: https://github.com/ImageMagick/ImageMagick/issues/376
X-Git-Tag: 7.0.4-8~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=384168959467404a3fbb1b7d7398ffe1b3fd6fd9;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/376
https://github.com/ImageMagick/ImageMagick/issues/375
---

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 6e8f6910e..30bf4b85d 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -4046,6 +4046,8 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
     into per-image artifacts, while ensuring only specifically set per-image
     artifacts are preserved when parenthesis ends.
   */
+  if (image->image_info != (ImageInfo *) NULL)
+    image->image_info=DestroyImageInfo(image->image_info);
   image->image_info=CloneImageInfo(image_info);
   return(MagickTrue);
 }
diff --git a/coders/sun.c b/coders/sun.c
index 3c0cb3864..33e7c3fe8 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -456,7 +456,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
         ThrowReaderException(ResourceLimitError,"ImproperImageHeader");
       }
     pixels_length=height*bytes_per_line;
-    sun_pixels=(unsigned char *) AcquireQuantumMemory(pixels_length,
+    sun_pixels=(unsigned char *) AcquireQuantumMemory(pixels_length+image->rows,
       sizeof(*sun_pixels));
     if (sun_pixels == (unsigned char *) NULL)
       {