GraphicsMagick: ReadCAPTIONImage(): Set draw_info to NULL upon d...

changeset 5ff36992c204 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=5ff36992c204
summary: ReadCAPTIONImage(): Set draw_info to NULL upon deallocation.

diffstat:

 ChangeLog                              |  6 ++++++
 VisualMagick/installer/inc/version.isx |  4 ++--
 coders/caption.c                       |  1 +
 magick/version.h                       |  4 ++--
 www/Changelog.html                     |  5 +++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r b052a71a5db7 -r 5ff36992c204 ChangeLog
--- a/ChangeLog	Fri Nov 05 11:02:54 2021 -0500
+++ b/ChangeLog	Mon Nov 15 19:59:08 2021 -0600
@@ -1,3 +1,9 @@
+2021-11-15  Bob Friesenhahn  <[email protected]>
+
+        * coders/caption.c (ReadCAPTIONImage): Set draw_info to NULL upon
+        deallocation.  Fixes an assertion reported by Michael Melcher via
+        the graphicsmagick-bugs list on November 11, 2021.
+
 2021-11-05  Bob Friesenhahn  <[email protected]>
 
         * coders/jp2.c (initialize_jasper): For JasPer 3.0.0 and later,
diff -r b052a71a5db7 -r 5ff36992c204 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Fri Nov 05 11:02:54 2021 -0500
+++ b/VisualMagick/installer/inc/version.isx	Mon Nov 15 19:59:08 2021 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020211105"
-#define public MagickPackageReleaseDate "snapshot-20211105"
+#define public MagickPackageVersionAddendum ".020211115"
+#define public MagickPackageReleaseDate "snapshot-20211115"
diff -r b052a71a5db7 -r 5ff36992c204 coders/caption.c
--- a/coders/caption.c	Fri Nov 05 11:02:54 2021 -0500
+++ b/coders/caption.c	Mon Nov 15 19:59:08 2021 -0600
@@ -160,6 +160,7 @@
     if (status == MagickFail)
       {
         DestroyDrawInfo(draw_info);
+        draw_info=(DrawInfo *) NULL;
         MagickFreeMemory(caption);
         ThrowCAPTIONException(TypeError,UnableToGetTypeMetrics,image);
       }
diff -r b052a71a5db7 -r 5ff36992c204 magick/version.h
--- a/magick/version.h	Fri Nov 05 11:02:54 2021 -0500
+++ b/magick/version.h	Mon Nov 15 19:59:08 2021 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x252200
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 25,22,0
-#define MagickChangeDate   "20211105"
-#define MagickReleaseDate  "snapshot-20211105"
+#define MagickChangeDate   "20211115"
+#define MagickReleaseDate  "snapshot-20211115"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r b052a71a5db7 -r 5ff36992c204 www/Changelog.html
--- a/www/Changelog.html	Fri Nov 05 11:02:54 2021 -0500
+++ b/www/Changelog.html	Mon Nov 15 19:59:08 2021 -0600
@@ -35,6 +35,11 @@
 <div class="document">
 
 
+<p>2021-11-15  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>
+* coders/caption.c (ReadCAPTIONImage): Set draw_info to NULL upon
+deallocation.  Fixes an assertion reported by Michael Melcher via
+the graphicsmagick-bugs list on November 11, 2021.</blockquote>
 <p>2021-11-05  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>
 * coders/jp2.c (initialize_jasper): For JasPer 3.0.0 and later,