Update to libxml2-2.13.2

Author: kiyolee

HTMLparser.c

@@ -6185,6 +6185,12 @@ htmlCtxtReset(htmlParserCtxtPtr ctxt)
     ctxt->extSubURI = NULL;
     DICT_FREE(ctxt->extSubSystem);
     ctxt->extSubSystem = NULL;
+
+    if (ctxt->directory != NULL) {
+        xmlFree(ctxt->directory);
+        ctxt->directory = NULL;
+    }
+
     if (ctxt->myDoc != NULL)
         xmlFreeDoc(ctxt->myDoc);
     ctxt->myDoc = NULL;

HTMLtree.c

@@ -385,22 +385,17 @@ htmlFindOutputEncoder(const char *encoding) {
     xmlCharEncodingHandler *handler = NULL;
 
     if (encoding != NULL) {
-	xmlCharEncoding enc;
+        int res;
 
-	enc = xmlParseCharEncoding(encoding);
-	if (enc != XML_CHAR_ENCODING_UTF8) {
-	    xmlOpenCharEncodingHandler(encoding, /* output */ 1, &handler);
-	    if (handler == NULL)
-		htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding);
-	}
+        res = xmlOpenCharEncodingHandler(encoding, /* output */ 1,
+                                         &handler);
+        if (res != XML_ERR_OK)
+            htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding);
     } else {
         /*
-         * Fallback to HTML or ASCII when the encoding is unspecified
+         * Fallback to HTML when the encoding is unspecified
          */
-        if (handler == NULL)
-            xmlOpenCharEncodingHandler("HTML", /* output */ 1, &handler);
-        if (handler == NULL)
-            xmlOpenCharEncodingHandler("ascii", /* output */ 1, &handler);
+        xmlOpenCharEncodingHandler("HTML", /* output */ 1, &handler);
     }
 
     return(handler);

NEWS

@@ -1,5 +1,24 @@
 NEWS file for libxml2
 
+v2.13.2: Jul 4 2024
+
+### Regressions
+
+- tree: Fix handling of empty strings in xmlNodeParseContent
+- valid: Restore ID lookup
+- parser: Reenable ctxt->directory
+- uri: Handle filesystem paths in xmlBuildRelativeURISafe
+- encoding: Make xmlFindCharEncodingHandler return UTF-8 handler
+- encoding: Fix encoding lookup with xmlOpenCharEncodingHandler
+- include: Define ATTRIBUTE_UNUSED for clang
+- uri: Fix xmlBuildURI with NULL base
+
+### Improvements
+
+- uri: Enable Windows paths on Cygwin
+- tests: Clarify licence of test/intsubset2.xml
+
+
 v2.13.1: Jun 19 2024
 
 ### Regressions
@@ -57,8 +76,12 @@ to be enabled by passing --with-zlib, --with-lzma or --with-http to
 configure. In legacy mode (--with-legacy) these options are enabled
 by default as before.
 
-Support for FTP and xpointer() XPath extensions will be removed in
-the next release.
+Support for FTP will be removed in the next release.
+
+Support for the range and point extensions of the xpointer() scheme
+will be removed in the next release. The rest of the XPointer
+implementation won't be affected. The xpointer() scheme will behave
+like the xpath1() scheme.
 
 Several more legacy symbols were deprecated. Users of the old "SAX1"
 API functions are encouraged to upgrade to the new "SAX2" API,

README.md

@@ -2,7 +2,7 @@
 
 libxml2 Windows build with Visual Studio.
 
-This version is libxml2-2.13.1.
+This version is libxml2-2.13.2.
 
 Note that LZMA support is only available for VS2013 or later.
 

SAX2.c

@@ -412,6 +412,13 @@ xmlSAX2ResolveEntity(void *ctx, const xmlChar *publicId, const xmlChar *systemId
     if (ctxt->input != NULL)
 	base = BAD_CAST ctxt->input->filename;
 
+    /*
+     * We don't really need the 'directory' struct member, but some
+     * users set it manually to a base URI for memory streams.
+     */
+    if (base == NULL)
+        base = BAD_CAST ctxt->directory;
+
     if ((xmlStrlen(systemId) > XML_MAX_URI_LENGTH) ||
         (xmlStrlen(base) > XML_MAX_URI_LENGTH)) {
         xmlFatalErr(ctxt, XML_ERR_RESOURCE_LIMIT, "URI too long");
@@ -574,6 +581,13 @@ xmlSAX2EntityDecl(void *ctx, const xmlChar *name, int type,
             }
         }
 
+        /*
+         * We don't really need the 'directory' struct member, but some
+         * users set it manually to a base URI for memory streams.
+         */
+        if (base == NULL)
+            base = ctxt->directory;
+
         res = xmlBuildURISafe(systemId, (const xmlChar *) base, &URI);
 
         if (URI == NULL) {
@@ -1255,6 +1269,7 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname,
     } else
 #endif /* LIBXML_VALID_ENABLED */
            if (((ctxt->loadsubset & XML_SKIP_IDS) == 0) &&
+               (ctxt->input->entity == NULL) &&
                /* Don't create IDs containing entity references */
                (ret->children != NULL) &&
                (ret->children->type == XML_TEXT_NODE) &&
@@ -1987,6 +2002,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
     } else
 #endif /* LIBXML_VALID_ENABLED */
            if (((ctxt->loadsubset & XML_SKIP_IDS) == 0) &&
+               (ctxt->input->entity == NULL) &&
                /* Don't create IDs containing entity references */
                (ret->children != NULL) &&
                (ret->children->type == XML_TEXT_NODE) &&

THIS_VERSION_IS_2.13.1 THIS_VERSION_IS_2.13.2

@@ -1 +1 @@
-https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.1.tar.xz
+https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.2.tar.xz

distfiles/download.url

@@ -1,18 +1,18 @@
 f437ed9058e8e5135e47c01e973376ba  Copyright
-81f2881accbc601275df1d0f2885c135  HTMLparser.c
-d04a2b2879cb84c5c3a195c2d444b335  HTMLtree.c
+799d00dfaca59a88a1ddcb7e564e6476  HTMLparser.c
+24211653eb3b5d6752f5eb91d6ecc3ef  HTMLtree.c
 dd63184811cb2ff705c3e466364d3773  INSTALL
-f3e85e6ed1d3dee747ccefcb42be5718  NEWS
+fe33b193822d5fb2d92b436f2547d765  NEWS
 5f32c16a4eccf442197b65fa65f3c7b8  README.libxml2.md
 7283878f36a935a3c00df077cf45af54  SAX.c
-4bb688a8949366334e6803484a0db05b  SAX2.c
+f2edb7da1ddb9093de9841519b68f576  SAX2.c
 67a65054d57590e61fdb1e70d2ea5a96  buf.c
 4b44ee7f5a69c1058b5e78cecd37a15c  c14n.c
 b86dee5a15a23fcae795b2fb2544b8dc  catalog.c
 691708e81dee605336b6ef6e431c5c21  chvalid.c
 697a63537714f6d73508f642b8caf24b  debugXML.c
 08d37f8cc00ce8576a00dd2c2725ffe3  dict.c
-c9a558a311456f1df0ce4da7fec493ca  encoding.c
+0beb3fd21633ebd2718add8a219d65c3  encoding.c
 74aea6c1f67db19f14a4ea658caabb50  entities.c
 1614814772ec00261f6c68dbb3fb2e87  error.c
 4a0ab9ada11a64828012376799576cfa  globals.c
@@ -48,7 +48,7 @@ f56a2156246c1eabc080d8c2f27d48b6  include/libxml/xinclude.h
 59b6841396e332b38f075694ac2db47d  include/libxml/xmlIO.h
 78602d66c5db00b0deece2c56ab86d43  include/libxml/xmlautomata.h
 04fa9aa45df384fe962db1a14fb59553  include/libxml/xmlerror.h
-dfd4234e18f823082d3d301f25cce375  include/libxml/xmlexports.h
+0ea11c4b60a6584f081053fcad323f4a  include/libxml/xmlexports.h
 13b117b714ad87f0fb17d302d9580cf3  include/libxml/xmlmemory.h
 1dda0f8301c72cab8c0015a4f36d008f  include/libxml/xmlmodule.h
 288e26a1a1b1e495a463ff90b7d243d7  include/libxml/xmlreader.h
@@ -86,8 +86,8 @@ cdbcf52ea11b6ee99454e3b9a3adeaac  legacy.c
 62f33a8621e3442770fd15a540a7eba0  list.c
 040942573dbd47e7188991ab3c9c9a99  nanoftp.c
 4c676ca8672af9c242eab69fb9e2056f  nanohttp.c
-776c4676d1903df60d19cd9c11e08ac4  parser.c
-f32e0c097c781ddc57b268169f83a320  parserInternals.c
+53c1f20bdbb724031dadb506e6683ff2  parser.c
+7a70d4383a870b265ca14cd498b37c85  parserInternals.c
 fc88d174a7b70de62c609c32ce3f55f8  pattern.c
 06b7f056c759cff032979e0075c5b318  relaxng.c
 371edae07b81c37668065294e77dedcd  runsuite.c
@@ -101,13 +101,13 @@ c48cacc169fbe69e961ceafbfb92ee71  testModule.c
 8efef0b6535d6c069678e9f6750d3742  testdict.c
 6a3e7cbf9864c04639a1a8ac0c388ea2  testdso.c
 e7f8098f4a9e147624c3cf7d652a70c0  testlimits.c
-ac0599e08f02704f5d7db1e36134248f  testparser.c
+6010c3c335e3369385618d022aade84a  testparser.c
 71ea68a83739869caba574c1725fba96  testrecurse.c
 d746403de87ca28dbb43a4a76e63a3d6  threads.c
 1bcb15667ab695cdd2cc8d5b1bc05169  timsort.h
-d94e4d3aee44c5a9c504f4b06e073e4e  tree.c
-7be25cd62649ec06302c67a0dbdcccc7  uri.c
-e1828d328a36cd0eea27256123122946  valid.c
+37417e0db954291ae7078a946456aa53  tree.c
+f8bea8ace4ec3a2d89543da6b91ab630  uri.c
+46d56681c3541150ee29b33f77e76bb8  valid.c
 8ab2045fb3bb5553449a93c85ebbb58a  win32/config.h
 9ca0965eeabe09b4f8d9a1c6c5d8c3b0  win32/libxml2.rc
 a9b815153157403c75b2c9abf687e97e  xinclude.c
@@ -119,7 +119,7 @@ a9b815153157403c75b2c9abf687e97e  xinclude.c
 9d8d0df11b80a714e97da726359977dc  xmlmodule.c
 adb85e00bf69885fdddf7fd16f5baf0e  xmlreader.c
 fda6796d6766ba055664f2993eca5ed7  xmlregexp.c
-35a26cd93568987405da54e9279d1359  xmlsave.c
+d877f026dd7130ed114ef4715be479bf  xmlsave.c
 7ad15c4a469cee12b90af8115dd76b5e  xmlschemas.c
 991c4949ca7a25c99a7beff8e7516915  xmlschemastypes.c
 82c2b7394f560d8af467b779026d3972  xmlstring.c

distfiles/libxml2-2.13.1.tar.xz

@@ -1279,9 +1279,8 @@ DECLARE_ISO_FUNCS(16)
     { (char *) name, in, out EMPTY_ICONV EMPTY_UCONV }
 
 static const xmlCharEncodingHandler defaultHandlers[] = {
-    MAKE_HANDLER("UTF-8", UTF8ToUTF8, UTF8ToUTF8)
 #ifdef LIBXML_OUTPUT_ENABLED
-    ,MAKE_HANDLER("UTF-16LE", UTF16LEToUTF8, UTF8ToUTF16LE)
+    MAKE_HANDLER("UTF-16LE", UTF16LEToUTF8, UTF8ToUTF16LE)
     ,MAKE_HANDLER("UTF-16BE", UTF16BEToUTF8, UTF8ToUTF16BE)
     ,MAKE_HANDLER("UTF-16", UTF16LEToUTF8, UTF8ToUTF16)
     ,MAKE_HANDLER("ISO-8859-1", isolat1ToUTF8, UTF8Toisolat1)
@@ -1291,7 +1290,7 @@ static const xmlCharEncodingHandler defaultHandlers[] = {
     ,MAKE_HANDLER("HTML", NULL, UTF8ToHtml)
 #endif
 #else
-    ,MAKE_HANDLER("UTF-16LE", UTF16LEToUTF8, NULL)
+    MAKE_HANDLER("UTF-16LE", UTF16LEToUTF8, NULL)
     ,MAKE_HANDLER("UTF-16BE", UTF16BEToUTF8, NULL)
     ,MAKE_HANDLER("UTF-16", UTF16LEToUTF8, NULL)
     ,MAKE_HANDLER("ISO-8859-1", isolat1ToUTF8, NULL)
@@ -1321,10 +1320,13 @@ static const xmlCharEncodingHandler defaultHandlers[] = {
 #define NUM_DEFAULT_HANDLERS \
     (sizeof(defaultHandlers) / sizeof(defaultHandlers[0]))
 
-static const xmlCharEncodingHandler *xmlUTF16LEHandler = &defaultHandlers[1];
-static const xmlCharEncodingHandler *xmlUTF16BEHandler = &defaultHandlers[2];
-static const xmlCharEncodingHandler *xmlLatin1Handler = &defaultHandlers[4];
-static const xmlCharEncodingHandler *xmlAsciiHandler = &defaultHandlers[5];
+static const xmlCharEncodingHandler xmlUTF8Handler =
+    MAKE_HANDLER("UTF-8", UTF8ToUTF8, UTF8ToUTF8);
+
+static const xmlCharEncodingHandler *xmlUTF16LEHandler = &defaultHandlers[0];
+static const xmlCharEncodingHandler *xmlUTF16BEHandler = &defaultHandlers[1];
+static const xmlCharEncodingHandler *xmlLatin1Handler = &defaultHandlers[3];
+static const xmlCharEncodingHandler *xmlAsciiHandler = &defaultHandlers[4];
 
 /* the size should be growable, but it's not a big deal ... */
 #define MAX_ENCODING_HANDLERS 50
@@ -1922,6 +1924,9 @@ xmlGetCharEncodingHandler(xmlCharEncoding enc) {
  *
  * The handler must be closed with xmlCharEncCloseFunc.
  *
+ * If the encoding is UTF-8, a NULL handler and no error code will
+ * be returned.
+ *
  * Available since 2.13.0.
  *
  * Returns an xmlParserErrors error code.
@@ -1941,6 +1946,10 @@ xmlOpenCharEncodingHandler(const char *name, int output,
     if (name == NULL)
         return(XML_ERR_ARGUMENT);
 
+    if ((xmlStrcasecmp(BAD_CAST name, BAD_CAST "UTF-8") == 0) ||
+        (xmlStrcasecmp(BAD_CAST name, BAD_CAST "UTF8") == 0))
+        return(XML_ERR_OK);
+
     /*
      * Do the alias resolution
      */
@@ -1957,6 +1966,9 @@ xmlOpenCharEncodingHandler(const char *name, int output,
 
     /*
      * Fallback using the canonical names
+     *
+     * TODO: We should make sure that the name of the returned
+     * handler equals norig.
      */
     enc = xmlParseCharEncoding(norig);
     return(xmlLookupCharEncodingHandler(enc, out));
@@ -1976,6 +1988,14 @@ xmlCharEncodingHandlerPtr
 xmlFindCharEncodingHandler(const char *name) {
     xmlCharEncodingHandler *ret;
 
+    /*
+     * This handler shouldn't be used, but we must return a non-NULL
+     * handler.
+     */
+    if ((xmlStrcasecmp(BAD_CAST name, BAD_CAST "UTF-8") == 0) ||
+        (xmlStrcasecmp(BAD_CAST name, BAD_CAST "UTF8") == 0))
+        return((xmlCharEncodingHandlerPtr) &xmlUTF8Handler);
+
     xmlOpenCharEncodingHandler(name, 0, &ret);
     return(ret);
 }

distfiles/libxml2-2.13.1-import.lst distfiles/libxml2-2.13.2-import.lst

@@ -42,7 +42,7 @@
  */
 
 #ifndef ATTRIBUTE_UNUSED
-  #if __GNUC__ * 100 + __GNUC_MINOR__ >= 207
+  #if __GNUC__ * 100 + __GNUC_MINOR__ >= 207 || defined(__clang__)
     #define ATTRIBUTE_UNUSED __attribute__((unused))
   #else
     #define ATTRIBUTE_UNUSED

distfiles/libxml2-2.13.1-import.md5 distfiles/libxml2-2.13.2-import.md5

@@ -15,21 +15,21 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.13.1"
+#define LIBXML_DOTTED_VERSION "2.13.2"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 21301
+#define LIBXML_VERSION 21302
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "21301"
+#define LIBXML_VERSION_STRING "21302"
 
 /**
  * LIBXML_VERSION_EXTRA:
@@ -44,7 +44,7 @@
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(21301);
+#define LIBXML_TEST_VERSION xmlCheckVersion(21302);
 
 /**
  * LIBXML_THREAD_ENABLED:

distfiles/libxml2-2.13.2.tar.xz

@@ -1940,8 +1940,11 @@ xmlCtxtGrowAttrs(xmlParserCtxtPtr ctxt, int nr) {
 int
 inputPush(xmlParserCtxtPtr ctxt, xmlParserInputPtr value)
 {
+    char *directory = NULL;
+
     if ((ctxt == NULL) || (value == NULL))
         return(-1);
+
     if (ctxt->inputNr >= ctxt->inputMax) {
         size_t newSize = ctxt->inputMax * 2;
         xmlParserInputPtr *tmp;
@@ -1955,9 +1958,24 @@ inputPush(xmlParserCtxtPtr ctxt, xmlParserInputPtr value)
         ctxt->inputTab = tmp;
         ctxt->inputMax = newSize;
     }
+
+    if ((ctxt->inputNr == 0) && (value->filename != NULL)) {
+        directory = xmlParserGetDirectory(value->filename);
+        if (directory == NULL) {
+            xmlErrMemory(ctxt);
+            return(-1);
+        }
+    }
+
     ctxt->inputTab[ctxt->inputNr] = value;
     ctxt->input = value;
-    return (ctxt->inputNr++);
+
+    if (ctxt->inputNr == 0) {
+        xmlFree(ctxt->directory);
+        ctxt->directory = directory;
+    }
+
+    return(ctxt->inputNr++);
 }
 /**
  * inputPop:
@@ -13269,6 +13287,12 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
     ctxt->extSubURI = NULL;
     DICT_FREE(ctxt->extSubSystem);
     ctxt->extSubSystem = NULL;
+
+    if (ctxt->directory != NULL) {
+        xmlFree(ctxt->directory);
+        ctxt->directory = NULL;
+    }
+
     if (ctxt->myDoc != NULL)
         xmlFreeDoc(ctxt->myDoc);
     ctxt->myDoc = NULL;

encoding.c

@@ -2469,6 +2469,7 @@ xmlFreeParserCtxt(xmlParserCtxtPtr ctxt)
     if (ctxt->sax != NULL)
 #endif /* LIBXML_SAX1_ENABLED */
         xmlFree(ctxt->sax);
+    if (ctxt->directory != NULL) xmlFree(ctxt->directory);
     if (ctxt->vctxt.nodeTab != NULL) xmlFree(ctxt->vctxt.nodeTab);
     if (ctxt->atts != NULL) xmlFree((xmlChar * *)ctxt->atts);
     if (ctxt->dict != NULL) xmlDictFree(ctxt->dict);