GraphicsMagick: MSLError()/SVGError(): Call xmlStopParser() rath...

changeset 631b7f2d66e8 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=631b7f2d66e8
summary: MSLError()/SVGError(): Call xmlStopParser() rather than setting parser instate = XML_PARSER_EOF.

diffstat:

 ChangeLog                              |   8 ++++++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 coders/msl.c                           |  10 ++++++----
 coders/svg.c                           |   2 +-
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |   7 +++++++
 6 files changed, 26 insertions(+), 9 deletions(-)

diffs (99 lines):

diff -r 22aaff86b4aa -r 631b7f2d66e8 ChangeLog
--- a/ChangeLog	Wed Jul 21 19:59:42 2021 -0500
+++ b/ChangeLog	Sat Aug 14 14:55:58 2021 -0500
@@ -1,3 +1,11 @@
+2021-08-14  Bob Friesenhahn  <[email protected]>
+
+        * coders/msl.c (MSLError): Call xmlStopParser() rather than
+        setting parser instate = XML_PARSER_EOF.
+
+        * coders/svg.c (SVGError): Call xmlStopParser() rather than
+        setting parser instate = XML_PARSER_EOF.
+
 2021-07-21  Bob Friesenhahn  <[email protected]>
 
         * coders/pdf.c (WritePDFImage): Use appropriate memory deallocator
diff -r 22aaff86b4aa -r 631b7f2d66e8 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Wed Jul 21 19:59:42 2021 -0500
+++ b/VisualMagick/installer/inc/version.isx	Sat Aug 14 14:55:58 2021 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020210721"
-#define public MagickPackageReleaseDate "snapshot-20210721"
+#define public MagickPackageVersionAddendum ".020210814"
+#define public MagickPackageReleaseDate "snapshot-20210814"
diff -r 22aaff86b4aa -r 631b7f2d66e8 coders/msl.c
--- a/coders/msl.c	Wed Jul 21 19:59:42 2021 -0500
+++ b/coders/msl.c	Sat Aug 14 14:55:58 2021 -0500
@@ -4344,9 +4344,9 @@
 #else
   (void) vsnprintf(reason,MaxTextExtent,format,operands);
 #endif
-  ThrowException2(msl_info->exception,DelegateFatalError,reason,"some text");
+  ThrowException2(msl_info->exception,DelegateFatalError,reason,(char *) NULL);
   va_end(operands);
-  msl_info->parser->instate = XML_PARSER_EOF;
+  xmlStopParser(msl_info->parser);
 }
 
 static void
@@ -4598,10 +4598,12 @@
       n=(long) strlen(message);
       if (n == 0)
         continue;
-      status=xmlParseChunk(msl_info.parser,message,(int) n,False);
+      status=xmlParseChunk(msl_info.parser,message,(int) n,False); /* here */
       if (status != 0)
         break;
-      (void) xmlParseChunk(msl_info.parser," ",1,False);
+      status=xmlParseChunk(msl_info.parser," ",1,False);
+      if (status != 0)
+        break;
       if (msl_info.exception->severity != UndefinedException)
         break;
     }
diff -r 22aaff86b4aa -r 631b7f2d66e8 coders/svg.c
--- a/coders/svg.c	Wed Jul 21 19:59:42 2021 -0500
+++ b/coders/svg.c	Sat Aug 14 14:55:58 2021 -0500
@@ -3846,7 +3846,7 @@
 #endif
   ThrowException2(svg_info->exception,CoderError,reason,(char *) NULL);
   va_end(operands);
-  svg_info->parser->instate = XML_PARSER_EOF;
+  xmlStopParser(svg_info->parser);
 }
 
 static void
diff -r 22aaff86b4aa -r 631b7f2d66e8 magick/version.h
--- a/magick/version.h	Wed Jul 21 19:59:42 2021 -0500
+++ b/magick/version.h	Sat Aug 14 14:55:58 2021 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x252200
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 25,22,0
-#define MagickChangeDate   "20210721"
-#define MagickReleaseDate  "snapshot-20210721"
+#define MagickChangeDate   "20210814"
+#define MagickReleaseDate  "snapshot-20210814"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 22aaff86b4aa -r 631b7f2d66e8 www/Changelog.html
--- a/www/Changelog.html	Wed Jul 21 19:59:42 2021 -0500
+++ b/www/Changelog.html	Sat Aug 14 14:55:58 2021 -0500
@@ -35,6 +35,13 @@
 <div class="document">
 
 
+<p>2021-08-14  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>
+<p>* coders/msl.c (MSLError): Call xmlStopParser() rather than
+setting parser instate = XML_PARSER_EOF.</p>
+<p>* coders/svg.c (SVGError): Call xmlStopParser() rather than
+setting parser instate = XML_PARSER_EOF.</p>
+</blockquote>
 <p>2021-07-21  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>
 <p>* coders/pdf.c (WritePDFImage): Use appropriate memory deallocator