WMF: Eliminate use of already freed heap data in error reporting path.
authorBob Friesenhahn <bfriesen@GraphicsMagick.org>
Wed, 26 Jul 2017 19:47:56 -0500
changeset 15102 be898b7c97bd
parent 15101 6a632982c866
child 15103 cd699a44f188
WMF: Eliminate use of already freed heap data in error reporting path.
ChangeLog
VisualMagick/installer/inc/version.isx
coders/wmf.c
magick/version.h
www/Changelog.html
--- a/ChangeLog	Tue Jul 25 20:11:16 2017 -0500
+++ b/ChangeLog	Wed Jul 26 19:47:56 2017 -0500
@@ -1,3 +1,9 @@
+2017-07-26  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* coders/wmf.c (ReadWMFImage): Eliminate use of already freed heap
+	data in error reporting path.  Problem was reported via email by
+	Agostino Sarubbo on Fri, 14 Jul 2017
+
 2017-07-25  Glenn Randers-Pehrson  <glennrp@simple.dallas.tx.us>
 
 	* coders/png.c (ReadMNGImage) Free chunk allocation that remains
--- a/VisualMagick/installer/inc/version.isx	Tue Jul 25 20:11:16 2017 -0500
+++ b/VisualMagick/installer/inc/version.isx	Wed Jul 26 19:47:56 2017 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020170725"
-#define public MagickPackageReleaseDate "snapshot-20170725"
+#define public MagickPackageVersionAddendum ".020170726"
+#define public MagickPackageReleaseDate "snapshot-20170726"
--- a/coders/wmf.c	Tue Jul 25 20:11:16 2017 -0500
+++ b/coders/wmf.c	Wed Jul 26 19:47:56 2017 -0500
@@ -2719,8 +2719,8 @@
   if(image->exception.severity != UndefinedException)
     ThrowException2(exception,
                    CoderWarning,
-                   ddata->image->exception.reason,
-                   ddata->image->exception.description);
+                   image->exception.reason,
+                   image->exception.description);
 
   if(logging)
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),"leave ReadWMFImage()");
--- a/magick/version.h	Tue Jul 25 20:11:16 2017 -0500
+++ b/magick/version.h	Wed Jul 26 19:47:56 2017 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x191600
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 19,16,0
-#define MagickChangeDate   "20170725"
-#define MagickReleaseDate  "snapshot-20170725"
+#define MagickChangeDate   "20170726"
+#define MagickReleaseDate  "snapshot-20170726"
 	
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
--- a/www/Changelog.html	Tue Jul 25 20:11:16 2017 -0500
+++ b/www/Changelog.html	Wed Jul 26 19:47:56 2017 -0500
@@ -35,6 +35,14 @@
 <div class="document">
 
 
+<p>2017-07-26  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li>coders/wmf.c (ReadWMFImage): Eliminate use of already freed heap
+data in error reporting path.  Problem was reported via email by
+Agostino Sarubbo on Fri, 14 Jul 2017</li>
+</ul>
+</blockquote>
 <p>2017-07-25  Glenn Randers-Pehrson  &lt;<a class="reference external" href="mailto:glennrp&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">glennrp<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">