From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 27 Dec 2017 02:35:08 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.7-17~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3d87ccac8cb0e11c92e09c9c311684c5b6e792c;p=imagemagick

...
---

diff --git a/coders/pwp.c b/coders/pwp.c
index 1d9cbbf23..2d61a3bed 100644
--- a/coders/pwp.c
+++ b/coders/pwp.c
@@ -193,11 +193,13 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (c == EOF)
       {
         (void) RelinquishUniqueFileResource(read_info->filename);
+        read_info=DestroyImageInfo(read_info);
         ThrowReaderException(CorruptImageError,"UnexpectedEndOfFile");
       }
     if (LocaleNCompare((char *) (magick+12),"SFW94A",6) != 0)
       {
         (void) RelinquishUniqueFileResource(read_info->filename);
+        read_info=DestroyImageInfo(read_info);
         ThrowReaderException(CorruptImageError,"ImproperImageHeader");
       }
     /*
@@ -209,9 +211,10 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if ((unique_file == -1) || (file == (FILE *) NULL))
       {
         (void) RelinquishUniqueFileResource(read_info->filename);
+        read_info=DestroyImageInfo(read_info);
+        image=DestroyImageList(image);
         ThrowFileException(exception,FileOpenError,"UnableToWriteFile",
           image->filename);
-        image=DestroyImageList(image);
         return((Image *) NULL);
       }
     length=fwrite("SFW94A",1,6,file);
@@ -228,6 +231,7 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (c == EOF)
       {
         (void) RelinquishUniqueFileResource(read_info->filename);
+        read_info=DestroyImageInfo(read_info);
         ThrowReaderException(CorruptImageError,"UnexpectedEndOfFile");
       }
     next_image=ReadImage(read_info,exception);