From: Glenn Randers-Pehrson <glennrp@gmail.com>
Date: Tue, 25 Jul 2017 18:10:22 +0000 (-0400)
Subject: Simplify solution for Issue618.
X-Git-Tag: 7.0.6-4~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cc53f1d8946bad2a2c62e084aaf956d4d889f08;p=imagemagick

Simplify solution for Issue618.
---

diff --git a/coders/png.c b/coders/png.c
index 01007898a..72094d770 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -4408,10 +4408,8 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
       {
         if (length > GetBlobSize(image))
           {
-            if (color_image != (Image *) NULL)
-              color_image=DestroyImage(color_image);
-            if (color_image_info != (ImageInfo *) NULL)
-              color_image_info=DestroyImageInfo(color_image_info);
+            DestroyJNG(NULL,&color_image,&color_image_info,NULL,NULL);
+              &alpha_image,&alpha_image_info);
             ThrowReaderException(CorruptImageError,
               "InsufficientImageDataInFile");
           }