appsec: update vendored libxml2 from 2.15.2 to 2.15.3

Author: Leiyks

appsec/third_party/libxml2/VERSION

@@ -1 +1 @@
-2.15.2
+2.15.3

appsec/third_party/libxml2/src/CMakeLists.txt

@@ -505,7 +505,11 @@ if(LIBXML2_WITH_TESTS)
     endforeach()
     if(Threads_FOUND)
         foreach(TEST runtest)
+        if(LIBXML2_WITH_ZLIB)
+            target_link_libraries(${TEST} ZLIB::ZLIB Threads::Threads)
+        else()
             target_link_libraries(${TEST} Threads::Threads)
+        endif()
         endforeach()
     endif()
     add_test(NAME runtest COMMAND runtest --out ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

appsec/third_party/libxml2/src/VERSION

@@ -1 +1 @@
-2.15.2
+2.15.3

appsec/third_party/libxml2/src/entities.c

@@ -29,6 +29,7 @@
 #include "private/entities.h"
 #include "private/error.h"
 #include "private/io.h"
+#include "private/tree.h"
 
 #ifndef SIZE_MAX
   #define SIZE_MAX ((size_t) -1)
@@ -637,6 +638,14 @@ xmlCopyEntity(void *payload, const xmlChar *name ATTRIBUTE_UNUSED) {
         if (cur->URI == NULL)
             goto error;
     }
+    /* Handle XML_TEXT_NODE children for XML_ENTITY_DECL */
+    if (ent->children != NULL) {
+        cur->children = xmlStaticCopyNodeList(ent->children, cur->doc, (xmlNodePtr)cur);
+        /* Update last pointers */
+        cur->last = cur->children;
+        while (cur->last && cur->last->next) cur->last = cur->last->next;
+    }
+
     return(cur);
 
 error:

appsec/third_party/libxml2/src/parser.c

@@ -7261,10 +7261,10 @@ xmlParseReference(xmlParserCtxt *ctxt) {
             if ((cur->type == XML_TEXT_NODE) ||
                 (ctxt->options & XML_PARSE_NOCDATA)) {
                 if (ctxt->sax->characters != NULL)
-                    ctxt->sax->characters(ctxt, cur->content, len);
+                    ctxt->sax->characters(ctxt->userData, cur->content, len);
             } else {
                 if (ctxt->sax->cdataBlock != NULL)
-                    ctxt->sax->cdataBlock(ctxt, cur->content, len);
+                    ctxt->sax->cdataBlock(ctxt->userData, cur->content, len);
             }
 
             cur = cur->next;
@@ -7284,10 +7284,12 @@ xmlParseReference(xmlParserCtxt *ctxt) {
                 if ((cur->type == XML_TEXT_NODE) ||
                     (ctxt->options & XML_PARSE_NOCDATA)) {
                     if (ctxt->sax->characters != NULL)
-                        ctxt->sax->characters(ctxt, cur->content, len);
+                        ctxt->sax->characters(ctxt->userData, cur->content,
+                                              len);
                 } else {
                     if (ctxt->sax->cdataBlock != NULL)
-                        ctxt->sax->cdataBlock(ctxt, cur->content, len);
+                        ctxt->sax->cdataBlock(ctxt->userData, cur->content,
+                                              len);
                 }
 
                 break;

appsec/third_party/libxml2/src/xmlstring.c

@@ -426,14 +426,21 @@ xmlStrncat(xmlChar *cur, const xmlChar *add, int len) {
 
     if ((add == NULL) || (len == 0))
         return(cur);
-    if (len < 0)
-	return(NULL);
+
+    if (len < 0) {
+        if (cur != NULL)
+            xmlFree(cur);
+        return(NULL);
+    }
+
     if (cur == NULL)
         return(xmlStrndup(add, len));
 
     size = xmlStrlen(cur);
-    if ((size < 0) || (size > INT_MAX - len))
+    if ((size < 0) || (size > INT_MAX - len)) {
+        xmlFree(cur);
         return(NULL);
+    }
     ret = (xmlChar *) xmlRealloc(cur, (size_t) size + len + 1);
     if (ret == NULL) {
         xmlFree(cur);