JNG: Fix double frees caused by changeset 15060:d445af60a8d5 commited on 2017-07-06
--- a/ChangeLog Sat Jul 08 09:20:58 2017 -0500
+++ b/ChangeLog Sat Jul 08 12:59:45 2017 -0500
@@ -1,5 +1,8 @@
2017-07-08 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+ * coders/png.c (ReadOneJNGImage): Fix double-frees caused by
+ commit on 2017-07-06.
+
* coders/jpeg.c (ReadJPEGImage): Defer creating pixel cache until
after successfully reading first scanline. Classify some serious
libjpeg reported "warnings" as errors and quit processing
--- a/coders/png.c Sat Jul 08 09:20:58 2017 -0500
+++ b/coders/png.c Sat Jul 08 12:59:45 2017 -0500
@@ -3622,6 +3622,10 @@
(void) LiberateUniqueFileResource(alpha_image->filename);
DestroyJNG(NULL,color_image,color_image_info,
alpha_image,alpha_image_info);
+ color_image = (Image *)NULL;
+ color_image_info = (ImageInfo *) NULL;
+ alpha_image = (Image *)NULL;
+ alpha_image_info = (ImageInfo *) NULL;
DestroyImage(jng_image);
jng_image = (Image *)NULL;
}
--- a/www/Changelog.html Sat Jul 08 09:20:58 2017 -0500
+++ b/www/Changelog.html Sat Jul 08 12:59:45 2017 -0500
@@ -38,6 +38,8 @@
<p>2017-07-08 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p>
<blockquote>
<ul class="simple">
+<li>coders/png.c (ReadOneJNGImage): Fix double-frees caused by
+commit on 2017-07-06.</li>
<li>coders/jpeg.c (ReadJPEGImage): Defer creating pixel cache until
after successfully reading first scanline. Classify some serious
libjpeg reported "warnings" as errors and quit processing