Update Source To libxml2-34.10

Configurations/Base.xcconfig

@@ -38,13 +38,13 @@ GCC_WARN_UNUSED_FUNCTION = YES;
 GCC_WARN_UNUSED_VARIABLE = YES;
 LINKER_DISPLAYS_MANGLED_NAMES = YES;
 PREBINDING = NO;
-// WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings;
-WARNING_CFLAGS = -Wformat=2 -Wformat-security -Wmissing-format-attribute;
+WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat=2 -Wmissing-format-attribute -Winit-self -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings $(SECURITY_WARNING_CFLAGS) -Wno-cast-qual -Wno-documentation -Wno-shorten-64-to-32;
+SECURITY_WARNING_CFLAGS = -Werror=array-bounds -Werror=array-bounds-pointer-arithmetic -Werror=builtin-memcpy-chk-size -Werror=conditional-uninitialized -Werror=empty-body -Werror=format-security -Werror=memset-transposed-args -Werror=return-stack-address -Werror=shadow -Werror=sizeof-array-argument -Werror=sizeof-array-decay -Werror=sizeof-pointer-memaccess -Werror=uninitialized -Werror=unused-result -Werror=vla;
 STRIP_INSTALLED_PRODUCT = YES;
 HEADER_SEARCH_PATHS = $(LIBXML2_HEADER_PATH);
 LIBXML2_HEADER_PATH = $(LIBXML2_HEADER_PATH_$(DEPLOYMENT_LOCATION));
-LIBXML2_HEADER_PATH_NO = $(SYMROOT)/$(CONFIGURATION)/usr/include/libxml2;
-LIBXML2_HEADER_PATH_YES = $(DSTROOT)/usr/include/libxml2;
+LIBXML2_HEADER_PATH_NO = $(SYMROOT)/$(CONFIGURATION)/usr/include;
+LIBXML2_HEADER_PATH_YES = $(DSTROOT)/usr/include;
 
 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CONFIGURATION));
 DEBUG_DEFINES_Debug = ;

Configurations/libxml2.a.xcconfig

@@ -2,7 +2,7 @@ PRODUCT_NAME = xml2;
 INSTALL_PATH = /usr/local/lib/libxml2;
 EXECUTABLE_PREFIX = lib;
 
-PUBLIC_HEADERS_FOLDER_PATH = /usr/include/libxml2/libxml;
+PUBLIC_HEADERS_FOLDER_PATH = /usr/include/libxml;
 
 // Override HEADER_SEARCH_PATHS from Base.xcconfig for libxml2.a.
 HEADER_SEARCH_PATHS = "$(SRCROOT)/Pregenerated Files/include" $(SRCROOT)/libxml2/include;

Configurations/libxml2.xcconfig

@@ -14,4 +14,4 @@ SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInte
 IS_ZIPPERED = YES;
 SUPPORTS_TEXT_BASED_API = YES;
 TAPI_VERIFY_MODE = Pedantic;
-OTHER_TAPI_FLAGS = -extra-public-header $(LIBXML2_HEADER_PATH) -extra-private-header $(SRCROOT)/"Pregenerated Files"/globalsCompat.h;
+OTHER_TAPI_FLAGS = -extra-public-header $(LIBXML2_HEADER_PATH)/libxml -extra-private-header $(SRCROOT)/"Pregenerated Files"/globalsCompat.h;

Pregenerated Files/README.txt

@@ -31,6 +31,11 @@ Steps to rebuild files:
 +               echo -L${libdir} -lxml2 -lz   -lpthread   -licucore -lm   
             fi
         fi
+   c. Fix --cflags path (make sure to include the space at the end):
+     --cflags)
+-       	echo -I${includedir}/libxml2 
++       	echo -I${includedir} 
+        	;;
 5. [Optional] Run tests (compare output prior to patch as there is some spew):
    make -j $(sysctl -n hw.ncpu)
    make check

Pregenerated Files/module.modulemap

@@ -1,21 +1,21 @@
 module libxml2 [system] [extern_c] {
-    // Add "-Xcc -I$(SDKROOT)/usr/include/libxml2" to OTHER_SWIFT_FLAGS in Xcode project.
+    link "xml2"
 
     module HTMLparser {
-        header "libxml/HTMLparser.h"
-        header "libxml/SAX.h"
-        header "libxml/SAX2.h"
-        header "libxml/globals.h"
-        header "libxml/parser.h"
-        header "libxml/threads.h"
-        header "libxml/tree.h"
-        header "libxml/xlink.h"
-        header "libxml/xmlmemory.h"
+        header "HTMLparser.h"
+        header "SAX.h"
+        header "SAX2.h"
+        header "globals.h"
+        header "parser.h"
+        header "threads.h"
+        header "tree.h"
+        header "xlink.h"
+        header "xmlmemory.h"
         export *
     }
 
     module HTMLtree {
-        header "libxml/HTMLtree.h"
+        header "HTMLtree.h"
         export *
     }
 
@@ -30,37 +30,37 @@ module libxml2 [system] [extern_c] {
     }
 
     module c14n {
-        header "libxml/c14n.h"
+        header "c14n.h"
         export *
     }
 
     module catalog {
-        header "libxml/catalog.h"
+        header "catalog.h"
         export *
     }
 
     module chvalid {
-        header "libxml/chvalid.h"
+        header "chvalid.h"
         export *
     }
 
     module debugXML {
-        header "libxml/debugXML.h"
+        header "debugXML.h"
         export *
     }
 
     module dict {
-        header "libxml/dict.h"
+        header "dict.h"
         export *
     }
 
     module encoding {
-        header "libxml/encoding.h"
+        header "encoding.h"
         export *
     }
 
     module entities {
-        header "libxml/entities.h"
+        header "entities.h"
         export *
     }
 
@@ -70,22 +70,22 @@ module libxml2 [system] [extern_c] {
     }
 
     module hash {
-        header "libxml/hash.h"
+        header "hash.h"
         export *
     }
 
     module list {
-        header "libxml/list.h"
+        header "list.h"
         export *
     }
 
     module nanoftp {
-        header "libxml/nanoftp.h"
+        header "nanoftp.h"
         export *
     }
 
     module nanohttp {
-        header "libxml/nanohttp.h"
+        header "nanohttp.h"
         export *
     }
 
@@ -95,27 +95,27 @@ module libxml2 [system] [extern_c] {
     }
 
     module parserInternals {
-        header "libxml/parserInternals.h"
+        header "parserInternals.h"
         export *
     }
 
     module pattern {
-        header "libxml/pattern.h"
+        header "pattern.h"
         export *
     }
 
     module relaxng {
-        header "libxml/relaxng.h"
+        header "relaxng.h"
         export *
     }
 
     module schemasInternals {
-        header "libxml/schemasInternals.h"
+        header "schemasInternals.h"
         export *
     }
 
     module schematron {
-        header "libxml/schematron.h"
+        header "schematron.h"
         export *
     }
 
@@ -130,17 +130,17 @@ module libxml2 [system] [extern_c] {
     }
 
     module uri {
-        header "libxml/uri.h"
+        header "uri.h"
         export *
     }
 
     module valid {
-        header "libxml/valid.h"
+        header "valid.h"
         export *
     }
 
     module xinclude {
-        header "libxml/xinclude.h"
+        header "xinclude.h"
         export *
     }
 
@@ -150,22 +150,22 @@ module libxml2 [system] [extern_c] {
     }
 
     module xmlIO {
-        header "libxml/xmlIO.h"
+        header "xmlIO.h"
         export *
     }
 
     module xmlautomata {
-        header "libxml/xmlautomata.h"
+        header "xmlautomata.h"
         export *
     }
 
     module xmlerror {
-        header "libxml/xmlerror.h"
+        header "xmlerror.h"
         export *
     }
 
     module xmlexports {
-        header "libxml/xmlexports.h"
+        header "xmlexports.h"
         export *
     }
 
@@ -175,69 +175,69 @@ module libxml2 [system] [extern_c] {
     }
 
     module xmlmodule {
-        header "libxml/xmlmodule.h"
+        header "xmlmodule.h"
         export *
     }
 
     module xmlreader {
-        header "libxml/xmlreader.h"
+        header "xmlreader.h"
         export *
     }
 
     module xmlregexp {
-        header "libxml/xmlregexp.h"
+        header "xmlregexp.h"
         export *
     }
 
     module xmlsave {
-        header "libxml/xmlsave.h"
+        header "xmlsave.h"
         export *
     }
 
     module xmlschemas {
-        header "libxml/xmlschemas.h"
+        header "xmlschemas.h"
         export *
     }
 
     module xmlschemastypes {
-        header "libxml/xmlschemastypes.h"
+        header "xmlschemastypes.h"
         export *
     }
 
     module xmlstring {
-        header "libxml/xmlstring.h"
+        header "xmlstring.h"
         export *
     }
 
     module xmlunicode {
-        header "libxml/xmlunicode.h"
+        header "xmlunicode.h"
         export *
     }
 
     module xmlversion {
-        header "libxml/xmlversion.h"
+        header "xmlversion.h"
         export *
     }
 
     module xmlwriter {
-        header "libxml/xmlwriter.h"
+        header "xmlwriter.h"
         export *
     }
 
     module xpath {
-        header "libxml/xpath.h"
+        header "xpath.h"
         export *
     }
 
     module xpathInternals {
-        header "libxml/xpathInternals.h"
+        header "xpathInternals.h"
         export *
     }
 
     module xpointer {
-        header "libxml/xpointer.h"
+        header "xpointer.h"
         export *
     }
 
-    exclude header "libxml/DOCBparser.h" // Deprecated.
+    exclude header "DOCBparser.h" // Deprecated.
 }

Pregenerated Files/xml2-config

@@ -67,7 +67,7 @@ while test $# -gt 0; do
 	;;
 
     --cflags)
-       	echo -I${includedir}/libxml2 
+       	echo -I${includedir} 
        	;;
 
     --libtool-libs)

libxml2.xcodeproj/project.pbxproj

@@ -501,7 +501,7 @@
 		442840BB2005CEF0003C405B /* Install module map */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 8;
-			dstPath = /usr/include/libxml2;
+			dstPath = /usr/include/libxml;
 			dstSubfolderSpec = 0;
 			files = (
 				442840BC2005CF1E003C405B /* module.modulemap in Install module map */,
@@ -662,6 +662,8 @@
 		4491DFC61CE67BB100002B02 /* libxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libxml.h; path = libxml2/libxml.h; sourceTree = SOURCE_ROOT; };
 		44B1E3281C4EDAA40064124E /* xzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xzlib.c; sourceTree = "<group>"; };
 		44B1E3291C4EDAD10064124E /* xzlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xzlib.h; path = libxml2/xzlib.h; sourceTree = SOURCE_ROOT; };
+		44C0436223DA54010076CBB2 /* globalsCompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = globalsCompat.h; sourceTree = "<group>"; };
+		44C0436323DA54010076CBB2 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
 		44D951441E24A47C00CC54CE /* result */ = {isa = PBXFileReference; lastKnownFileType = folder; name = result; path = ../libxml2/result; sourceTree = "<group>"; };
 		44D951451E24A47C00CC54CE /* test */ = {isa = PBXFileReference; lastKnownFileType = folder; name = test; path = ../libxml2/test; sourceTree = "<group>"; };
 		44F286B11EADB1CD00BA8B08 /* FuzzExecutable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FuzzExecutable.xcconfig; sourceTree = "<group>"; };
@@ -1148,8 +1150,10 @@
 		5D58B06014F81D1100BE69D8 /* Pregenerated Files */ = {
 			isa = PBXGroup;
 			children = (
+				44C0436323DA54010076CBB2 /* README.txt */,
 				5D58B05E14F81AF200BE69D8 /* config.h */,
 				448D7E421EA5CC4100ECC756 /* empty.c */,
+				44C0436223DA54010076CBB2 /* globalsCompat.h */,
 				44083DB62009516B0037BECF /* libxml2.exp */,
 				442840BA2005CE80003C405B /* module.modulemap */,
 				5DB38B2914F886A10060A507 /* xml2-config */,
@@ -1686,6 +1690,7 @@
 				5D58AF5814F815F500BE69D8 /* Sources */,
 				5D58AF5914F815F500BE69D8 /* Frameworks */,
 				5DB38AF914F87C9F0060A507 /* Create libxml2.dylib Symlink */,
+				4455F861237E07EA001469A1 /* Create /usr/lib/libxml2 Symlink */,
 				5DB38B2314F883700060A507 /* Rename License File */,
 				5DB38B1C14F8828C0060A507 /* Install License File */,
 				5DB38B1F14F882CA0060A507 /* Install Open Source Property List */,
@@ -1799,6 +1804,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 5D58AF5114F815F500BE69D8;
@@ -1854,6 +1860,24 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		4455F861237E07EA001469A1 /* Create /usr/lib/libxml2 Symlink */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create /usr/lib/libxml2 Symlink";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "set -e\n\nif [[ \"${ACTION}\" == \"install\" ]]; then\n    mkdir -p \"${LIBXML2_HEADER_PATH}/libxml2\";\n    (cd \"${LIBXML2_HEADER_PATH}/libxml2\"; ln -sf ../libxml ./libxml);\nfi;\n";
+		};
 		4472763E1E24FCEB00EBF424 /* Extract runxmlconf test files */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1899,7 +1923,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
-			shellScript = "cp libxml2/Copyright \"${BUILT_PRODUCTS_DIR}/libxml2.txt\"";
+			shellScript = "cp libxml2/Copyright \"${BUILT_PRODUCTS_DIR}/libxml2.txt\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

libxml2/HTMLparser.c

@@ -3416,13 +3416,16 @@ htmlParseCharRef(htmlParserCtxtPtr ctxt) {
         ((NXT(2) == 'x') || NXT(2) == 'X')) {
 	SKIP(3);
 	while (CUR != ';') {
-	    if ((CUR >= '0') && (CUR <= '9'))
-	        val = val * 16 + (CUR - '0');
-	    else if ((CUR >= 'a') && (CUR <= 'f'))
-	        val = val * 16 + (CUR - 'a') + 10;
-	    else if ((CUR >= 'A') && (CUR <= 'F'))
-	        val = val * 16 + (CUR - 'A') + 10;
-	    else {
+	    if ((CUR >= '0') && (CUR <= '9')) {
+                if (val < 0x110000)
+	            val = val * 16 + (CUR - '0');
+            } else if ((CUR >= 'a') && (CUR <= 'f')) {
+                if (val < 0x110000)
+	            val = val * 16 + (CUR - 'a') + 10;
+            } else if ((CUR >= 'A') && (CUR <= 'F')) {
+                if (val < 0x110000)
+	            val = val * 16 + (CUR - 'A') + 10;
+            } else {
 	        htmlParseErr(ctxt, XML_ERR_INVALID_HEX_CHARREF,
 		             "htmlParseCharRef: missing semicolon\n",
 			     NULL, NULL);
@@ -3435,9 +3438,10 @@ htmlParseCharRef(htmlParserCtxtPtr ctxt) {
     } else if  ((CUR == '&') && (NXT(1) == '#')) {
 	SKIP(2);
 	while (CUR != ';') {
-	    if ((CUR >= '0') && (CUR <= '9'))
-	        val = val * 10 + (CUR - '0');
-	    else {
+	    if ((CUR >= '0') && (CUR <= '9')) {
+                if (val < 0x110000)
+	            val = val * 10 + (CUR - '0');
+            } else {
 	        htmlParseErr(ctxt, XML_ERR_INVALID_DEC_CHARREF,
 		             "htmlParseCharRef: missing semicolon\n",
 			     NULL, NULL);
@@ -3456,6 +3460,9 @@ htmlParseCharRef(htmlParserCtxtPtr ctxt) {
      */
     if (IS_CHAR(val)) {
         return(val);
+    } else if (val >= 0x110000) {
+	htmlParseErr(ctxt, XML_ERR_INVALID_CHAR,
+		     "htmlParseCharRef: value too large\n", NULL, NULL);
     } else {
 	htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
 			"htmlParseCharRef: invalid xmlChar value %d\n",
@@ -5377,7 +5384,7 @@ static int
 htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
     int ret = 0;
     htmlParserInputPtr in;
-    int avail = 0;
+    ptrdiff_t avail = 0;
     xmlChar cur, next;
 
     htmlParserNodeInfo node_info;
@@ -5442,7 +5449,8 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 	if (in->buf == NULL)
 	    avail = in->length - (in->cur - in->base);
 	else
-	    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+	    avail = (ptrdiff_t)xmlBufUse(in->buf->buffer) -
+                    (in->cur - in->base);
 	if ((avail == 0) && (terminate)) {
 	    htmlAutoCloseOnEnd(ctxt);
 	    if ((ctxt->nameNr == 0) && (ctxt->instate != XML_PARSER_EOF)) {
@@ -5478,7 +5486,8 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		    if (in->buf == NULL)
 			avail = in->length - (in->cur - in->base);
 		    else
-			avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+			avail = (ptrdiff_t)xmlBufUse(in->buf->buffer) -
+                                (in->cur - in->base);
 		}
 		if ((ctxt->sax) && (ctxt->sax->setDocumentLocator))
 		    ctxt->sax->setDocumentLocator(ctxt->userData,
@@ -5520,7 +5529,8 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		if (in->buf == NULL)
 		    avail = in->length - (in->cur - in->base);
 		else
-		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+		    avail = (ptrdiff_t)xmlBufUse(in->buf->buffer) -
+                            (in->cur - in->base);
 		/*
 		 * no chars in buffer
 		 */
@@ -5593,7 +5603,8 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		if (in->buf == NULL)
 		    avail = in->length - (in->cur - in->base);
 		else
-		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+		    avail = (ptrdiff_t)xmlBufUse(in->buf->buffer) -
+                            (in->cur - in->base);
 		if (avail < 2)
 		    goto done;
 		cur = in->cur[0];
@@ -5634,7 +5645,8 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
 		if (in->buf == NULL)
 		    avail = in->length - (in->cur - in->base);
 		else
-		    avail = xmlBufUse(in->buf->buffer) - (in->cur - in->base);
+		    avail = (ptrdiff_t)xmlBufUse(in->buf->buffer) -
+                            (in->cur - in->base);
 		if (avail < 1)
 		    goto done;
 		cur = in->cur[0];
@@ -6175,12 +6187,12 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size,
 	int res;
 
 	res = xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
+        xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input, base, cur);
 	if (res < 0) {
 	    ctxt->errNo = XML_PARSER_EOF;
 	    ctxt->disableSAX = 1;
 	    return (XML_PARSER_EOF);
 	}
-        xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input, base, cur);
 #ifdef DEBUG_PUSH
 	xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size);
 #endif
@@ -6199,12 +6211,12 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, const char *chunk, int size,
 		size_t current = ctxt->input->cur - ctxt->input->base;
 
 		nbchars = xmlCharEncInput(in, terminate);
+		xmlBufSetInputBaseCur(in->buffer, ctxt->input, base, current);
 		if (nbchars < 0) {
 		    htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
 			         "encoder error\n", NULL, NULL);
 		    return(XML_ERR_INVALID_ENCODING);
 		}
-		xmlBufSetInputBaseCur(in->buffer, ctxt->input, base, current);
 	    }
 	}
     }
@@ -6743,10 +6755,7 @@ htmlCtxtReset(htmlParserCtxtPtr ctxt)
 
 #ifdef __APPLE__
 #include <dispatch/dispatch.h>
-#include <mach-o/dyld.h>
-
-extern int dyld_get_program_sdk_version(void);
-#define DYLD_MACOSX_VERSION_10_9 0x000A0900
+#include <mach-o/dyld_priv.h>
 
 // libxml2 v2.9 changed the HTML parser's handling of whitespace in a way that broke
 // H&R Block at Home 2010. Detect H&R Block at Home 2010 and mimic the old parser behavior.
@@ -6767,9 +6776,12 @@ static bool evaluteHTMLParserNeedsNoBlankQuirkCriteria(void)
     if (strcmp(executableName, "TaxCut.real"))
         return false;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Apply the workaround if the application was linked against an SDK prior to where
     // libxml2 v2.9 was present.
     return dyld_get_program_sdk_version() < DYLD_MACOSX_VERSION_10_9;
+#pragma clang diagnostic pop
 }
 
 static bool htmlParserNeedsNoBlankQuirk(void)
@@ -6783,7 +6795,7 @@ static bool htmlParserNeedsNoBlankQuirk(void)
     return needsQuirk;
 }
 
-#endif
+#endif // __APPLE__
 
 /**
  * htmlCtxtUseOptions:

libxml2/SAX2.c

@@ -2202,10 +2202,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
 
 #ifdef __APPLE__
 #include <dispatch/dispatch.h>
-#include <mach-o/dyld.h>
-
-extern int dyld_get_program_sdk_version(void);
-#define DYLD_MACOSX_VERSION_10_9 0x000A0900
+#include <mach-o/dyld_priv.h>
 
 // libxml2 v2.9 changed how elements with undeclared namespace prefixes are handled, an error case that has undefined behavior,
 // in such a way that broke Microsoft Document Connection. Detect Microsoft Document Connection and mimic the old behavior.
@@ -2226,9 +2223,12 @@ static bool evaluateStartElementNSNeedsUndeclaredPrefixQuirk(void)
     if (strcmp(executableName, "Microsoft Document Connection"))
         return false;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Apply the workaround if the application was linked against an SDK prior to where
     // libxml2 v2.9 was present.
     return dyld_get_program_sdk_version() < DYLD_MACOSX_VERSION_10_9;
+#pragma clang diagnostic pop
 }
 
 static bool startElementNSNeedsUndeclaredPrefixQuirk(void)
@@ -2242,7 +2242,7 @@ static bool startElementNSNeedsUndeclaredPrefixQuirk(void)
     return needsQuirk;
 }
 
-#endif
+#endif // __APPLE__
 
 /**
  * xmlSAX2StartElementNs:

libxml2/buf.c

@@ -1234,10 +1234,12 @@ xmlBufBackToBuffer(xmlBufPtr buf) {
          * Keep the buffer but provide a truncated size value.
          */
         xmlBufOverflowError(buf, "Allocated size too big for xmlBuffer");
+        ret->use = (int) buf->use;
         ret->size = INT_MAX;
+    } else {
+        ret->use = (int) buf->use;
+        ret->size = (int) buf->size;
     }
-    ret->use = (int) buf->use;
-    ret->size = (int) buf->size;
     ret->alloc = buf->alloc;
     ret->content = buf->content;
     ret->contentIO = buf->contentIO;
@@ -1333,8 +1335,12 @@ xmlBufGetInputBase(xmlBufPtr buf, xmlParserInputPtr input) {
 int
 xmlBufSetInputBaseCur(xmlBufPtr buf, xmlParserInputPtr input,
                       size_t base, size_t cur) {
-    if ((input == NULL) || (buf == NULL) || (buf->error))
+    if (input == NULL)
         return(-1);
+    if ((buf == NULL) || (buf->error)) {
+        input->base = input->cur = input->end = BAD_CAST "";
+        return(-1);
+    }
     CHECK_COMPAT(buf)
     input->base = &buf->content[base];
     input->cur = input->base + cur;

libxml2/c14n.c

@@ -2037,13 +2037,13 @@ xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes,
     }
 
     ret = xmlBufUse(buf->buffer);
-    if (ret > 0) {
+    if (ret >= 0) {
         *doc_txt_ptr = xmlStrndup(xmlBufContent(buf->buffer), ret);
     }
     (void) xmlOutputBufferClose(buf);
 
-    if ((*doc_txt_ptr == NULL) && (ret > 0)) {
-        xmlC14NErrMemory("coping canonicanized document");
+    if ((*doc_txt_ptr == NULL) && (ret >= 0)) {
+        xmlC14NErrMemory("copying canonicalized document");
         return (-1);
     }
     return (ret);

libxml2/encoding.c

@@ -494,13 +494,18 @@ UTF16LEToUTF8(unsigned char* out, int *outlen,
 {
     unsigned char* outstart = out;
     const unsigned char* processed = inb;
-    unsigned char* outend = out + *outlen;
+    unsigned char* outend;
     unsigned short* in = (unsigned short*) inb;
     unsigned short* inend;
     unsigned int c, d, inlen;
     unsigned char *tmp;
     int bits;
 
+    if (*outlen == 0) {
+        *inlenb = 0;
+        return(0);
+    }
+    outend = out + *outlen;
     if ((*inlenb % 2) == 1)
         (*inlenb)--;
     inlen = *inlenb / 2;
@@ -2414,7 +2419,7 @@ xmlCharEncOutput(xmlOutputBufferPtr output, int init)
 {
     int ret = -2;
     size_t written;
-    size_t writtentot = 0;
+    int writtentot = 0;
     size_t toconv;
     int c_in;
     int c_out;
@@ -2464,7 +2469,7 @@ retry:
 	xmlGenericError(xmlGenericErrorContext,
 		"initialized encoder\n");
 #endif
-        return(0);
+        return(c_out);
     }
 
     /*
@@ -2618,7 +2623,7 @@ retry:
 	    break;
 	}
     }
-    return(ret);
+    return(writtentot ? writtentot : ret);
 }
 #endif
 

libxml2/parser.c

@@ -132,6 +132,7 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
                      xmlEntityPtr ent, size_t replacement)
 {
     size_t consumed = 0;
+    int i;
 
     if ((ctxt == NULL) || (ctxt->options & XML_PARSE_HUGE))
         return (0);
@@ -166,6 +167,28 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
 	    rep = NULL;
 	}
     }
+
+    /*
+     * Prevent entity exponential check, not just replacement while
+     * parsing the DTD
+     * The check is potentially costly so do that only once in a thousand
+     */
+    if ((ctxt->instate == XML_PARSER_DTD) && (ctxt->nbentities > 10000) &&
+        (ctxt->nbentities % 1024 == 0)) {
+	for (i = 0;i < ctxt->inputNr;i++) {
+	    consumed += ctxt->inputTab[i]->consumed +
+	               (ctxt->inputTab[i]->cur - ctxt->inputTab[i]->base);
+	}
+	if (ctxt->nbentities > consumed * XML_PARSER_NON_LINEAR) {
+	    xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
+	    ctxt->instate = XML_PARSER_EOF;
+	    return (1);
+	}
+	consumed = 0;
+    }
+
+
+
     if (replacement != 0) {
 	if (replacement < XML_MAX_TEXT_LENGTH)
 	    return(0);
@@ -8183,6 +8206,9 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt)
 	    if (xmlPushInput(ctxt, input) < 0)
 		return;
 	} else {
+	    if (xmlParserEntityCheck(ctxt, 0, entity, 0))
+	        return;
+
 	    if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
 	        ((ctxt->options & XML_PARSE_NOENT) == 0) &&
 		((ctxt->options & XML_PARSE_DTDVALID) == 0) &&

libxml2/result/XInclude/fallback3.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<a>
+    <doc xml:base="../ents/something.xml">
+<p>something</p>
+<p>really</p>
+<p>simple</p>
+</doc>
+</a>

libxml2/result/XInclude/fallback3.xml.rdr

@@ -0,0 +1,25 @@
+0 1 a 0 0
+1 14 #text 0 1 
+    
+1 1 doc 0 0
+2 14 #text 0 1 
+
+2 1 p 0 0
+3 3 #text 0 1 something
+2 15 p 0 0
+2 14 #text 0 1 
+
+2 1 p 0 0
+3 3 #text 0 1 really
+2 15 p 0 0
+2 14 #text 0 1 
+
+2 1 p 0 0
+3 3 #text 0 1 simple
+2 15 p 0 0
+2 14 #text 0 1 
+
+1 15 doc 0 0
+1 14 #text 0 1 
+
+0 15 a 0 0

libxml2/result/XInclude/fallback4.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<a>
+    
+            <doc xml:base="../ents/something.xml">
+<p>something</p>
+<p>really</p>
+<p>simple</p>
+</doc>
+        
+</a>

libxml2/result/XInclude/fallback4.xml.rdr

@@ -0,0 +1,29 @@
+0 1 a 0 0
+1 14 #text 0 1 
+    
+1 14 #text 0 1 
+            
+1 1 doc 0 0
+2 14 #text 0 1 
+
+2 1 p 0 0
+3 3 #text 0 1 something
+2 15 p 0 0
+2 14 #text 0 1 
+
+2 1 p 0 0
+3 3 #text 0 1 really
+2 15 p 0 0
+2 14 #text 0 1 
+
+2 1 p 0 0
+3 3 #text 0 1 simple
+2 15 p 0 0
+2 14 #text 0 1 
+
+1 15 doc 0 0
+1 14 #text 0 1 
+        
+1 14 #text 0 1 
+
+0 15 a 0 0

libxml2/result/regexp/bug783015.err

@@ -1,2 +1 @@
-regexp error : failed to compile: Unterminated quantifier
-regexp error : failed to compile: xmlFAParseRegExp: extra characters
+regexp error : failed to compile: Improper quantifier