GraphicsMagick: 2 new changesets

changeset abc616ca32e4 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=abc616ca32e4
summary: SVG SVGEntityDeclaration(): Report an error if xmlAddDocEntity() or xmlAddDtdEntity() fails.

changeset aee8477213b0 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=aee8477213b0
summary: MSL MSLEntityDeclaration(): Report an error if xmlAddDocEntity() or xmlAddDtdEntity() fails.

diffstat:

 ChangeLog                              |   8 ++++++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 coders/msl.c                           |  24 ++++++++++++++++--------
 coders/svg.c                           |  25 ++++++++++++++++++-------
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |   9 +++++++++
 6 files changed, 55 insertions(+), 19 deletions(-)

diffs (158 lines):

diff -r fdb3441c9d65 -r aee8477213b0 ChangeLog
--- a/ChangeLog	Sun Dec 18 16:00:24 2022 -0600
+++ b/ChangeLog	Tue Dec 20 15:52:28 2022 -0600
@@ -1,3 +1,11 @@
+2022-12-20  Bob Friesenhahn  <[email protected]>
+
+	* coders/msl.c (MSLEntityDeclaration): Report an error if
+	xmlAddDocEntity() or xmlAddDtdEntity() fails.
+
+	* coders/svg.c (SVGEntityDeclaration): Report an error if
+	xmlAddDocEntity() or xmlAddDtdEntity() fails.
+
 2022-12-18  Bob Friesenhahn  <[email protected]>
 
 	* NEWS.txt: Updated the news.
diff -r fdb3441c9d65 -r aee8477213b0 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sun Dec 18 16:00:24 2022 -0600
+++ b/VisualMagick/installer/inc/version.isx	Tue Dec 20 15:52:28 2022 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020221218"
-#define public MagickPackageReleaseDate "snapshot-20221218"
+#define public MagickPackageVersionAddendum ".020221220"
+#define public MagickPackageReleaseDate "snapshot-20221220"
diff -r fdb3441c9d65 -r aee8477213b0 coders/msl.c
--- a/coders/msl.c	Sun Dec 18 16:00:24 2022 -0600
+++ b/coders/msl.c	Tue Dec 20 15:52:28 2022 -0600
@@ -122,6 +122,9 @@
 */
 static unsigned int
   WriteMSLImage(const ImageInfo *,Image *);
+
+static void
+MSLError(void *context,const char *format,...) MAGICK_ATTRIBUTE((__format__ (__printf__,2,3)));
 
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -301,12 +304,20 @@
      system_id != (const xmlChar *) NULL ?(char *) system_id : "none",content);
   msl_info=(MSLInfo *) context;
   if (msl_info->parser->inSubset == 1)
-    (void) xmlAddDocEntity(msl_info->document,name,type,public_id,system_id,
-                           content);
+    {
+      if (xmlAddDocEntity(msl_info->document,name,type,public_id,system_id,
+                          content) == (xmlEntityPtr) NULL)
+        MSLError(context, "SAX.entityDecl: xmlAddDocEntity() returned NULL!");
+    }
   else
-    if (msl_info->parser->inSubset == 2)
-      (void) xmlAddDtdEntity(msl_info->document,name,type,public_id,system_id,
-                             content);
+    {
+      if (msl_info->parser->inSubset == 2)
+        {
+          if (xmlAddDtdEntity(msl_info->document,name,type,public_id,system_id,
+                              content) == (xmlEntityPtr) NULL)
+            MSLError(context, "SAX.entityDecl: xmlAddDtdEntity() returned NULL!");
+        }
+    }
 }
 
 static void
@@ -4347,9 +4358,6 @@
 }
 
 static void
-MSLError(void *context,const char *format,...) MAGICK_ATTRIBUTE((__format__ (__printf__,2,3)));
-
-static void
 MSLError(void *context,const char *format,...)
 {
   char
diff -r fdb3441c9d65 -r aee8477213b0 coders/svg.c
--- a/coders/svg.c	Sun Dec 18 16:00:24 2022 -0600
+++ b/coders/svg.c	Tue Dec 20 15:52:28 2022 -0600
@@ -636,7 +636,7 @@
     *svg_info;
 
   /*
-    Does this document has an internal subset?
+    Create an internal subset (svg_info->document->intSubset)
   */
   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                         "  SAX.internalSubset(%.1024s, %.1024s, %.1024s)",(char *) name,
@@ -719,12 +719,20 @@
                         system_id != (xmlChar *) NULL ? (char *) system_id : "none",content);
   svg_info=(SVGInfo *) context;
   if (svg_info->parser->inSubset == 1)
-    (void) xmlAddDocEntity(svg_info->document,name,type,public_id,system_id,
-                           content);
+    {
+      if (xmlAddDocEntity(svg_info->document,name,type,public_id,system_id,
+                          content) == (xmlEntityPtr) NULL)
+        SVGError(context, "SAX.entityDecl: xmlAddDocEntity() returned NULL!");
+    }
   else
-    if (svg_info->parser->inSubset == 2)
-      (void) xmlAddDtdEntity(svg_info->document,name,type,public_id,system_id,
-                             content);
+    {
+      if (svg_info->parser->inSubset == 2)
+        {
+          if (xmlAddDtdEntity(svg_info->document,name,type,public_id,system_id,
+                              content) == (xmlEntityPtr) NULL)
+            SVGError(context, "SAX.entityDecl: xmlAddDtdEntity() returned NULL!");
+        }
+    }
 }
 
 static void
@@ -4143,7 +4151,10 @@
       */
       SVGEndDocument(&svg_info);
       if (svg_info.parser->myDoc != (xmlDocPtr) NULL)
-        xmlFreeDoc(svg_info.parser->myDoc);
+        {
+          xmlFreeDoc(svg_info.parser->myDoc);
+          svg_info.parser->myDoc = (xmlDocPtr) NULL;
+        }
       /*
         Free all the memory used by a parser context. However the parsed
         document in ctxt->myDoc is not freed (so we just did that).
diff -r fdb3441c9d65 -r aee8477213b0 magick/version.h
--- a/magick/version.h	Sun Dec 18 16:00:24 2022 -0600
+++ b/magick/version.h	Tue Dec 20 15:52:28 2022 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272400
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,0
-#define MagickChangeDate   "20221218"
-#define MagickReleaseDate  "snapshot-20221218"
+#define MagickChangeDate   "20221220"
+#define MagickReleaseDate  "snapshot-20221220"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r fdb3441c9d65 -r aee8477213b0 www/Changelog.html
--- a/www/Changelog.html	Sun Dec 18 16:00:24 2022 -0600
+++ b/www/Changelog.html	Tue Dec 20 15:52:28 2022 -0600
@@ -37,6 +37,15 @@
 </div>
 
 <div class="document">
+<p>2022-12-20  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><p>coders/msl.c (MSLEntityDeclaration): Report an error if
+xmlAddDocEntity() or xmlAddDtdEntity() fails.</p></li>
+<li><p>coders/svg.c (SVGEntityDeclaration): Report an error if
+xmlAddDocEntity() or xmlAddDtdEntity() fails.</p></li>
+</ul>
+</blockquote>
 <p>2022-12-18  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">