Simplify solution for Issue618.

diff --git a/coders/png.c b/coders/png.c
index 01007898a10f179da0ac4aa7afb19d19cffed1b6..72094d770a94460cb6bd75e6b3ffe19c80a4e61c 100644 (file)
--- 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");
           }