[Backport] Security bug 1304659

Roll libxml from eab86522 to 37ebf8a8

This patch also updates the roll.py script to be python3 compatible.

2021-05-31 damjan.jov@gmail.com Document support for the non-standard escape sequences. Support non-BMP code points in surrogate pairs of '\uXXXX\uXXXX'.
2021-05-30 damjan.jov@gmail.com Use strtoul() instead of sscanf, and correct data types that break GCC.
2021-05-29 damjan.jov@gmail.com Add support for some non-standard escapes in regular expressions.
2021-07-17 mike.dalessio@gmail.com htmlParseComment: handle abruptly-closed comments
2021-07-17 mike.dalessio@gmail.com test coverage for abruptly-closed comments
2021-08-21 damjan.jov@gmail.com Properly fold whitespace around the QName value when validating an XSD schema.
2021-08-19 damjan.jov@gmail.com Add whitespace folding for some atomic data types that it's missing on.
2022-01-12 oliver.diehl@nxp.com Add let variable tag support
2022-01-11 oliver.diehl@nxp.com Add value-of tag support
2022-01-11 oliver.diehl@nxp.com Replaced tabs by 4 spaces
2022-03-02 wellnhofer@aevum.de Remove obsolete AC_HEADER checks
2022-03-02 wellnhofer@aevum.de Don't check for standard C89 library functions
2022-03-02 wellnhofer@aevum.de Don't check for standard C89 headers
2022-03-01 wellnhofer@aevum.de Remove broken VxWorks support
2022-03-01 wellnhofer@aevum.de Remove broken Mac OS 9 support
2022-03-01 wellnhofer@aevum.de Remove useless call to xmlRelaxNGCleanupTypes
2022-03-01 wellnhofer@aevum.de Reset last error in xmlCleanupGlobals
2022-03-01 wellnhofer@aevum.de Warn when using deprecated functions from Python bindings
2022-03-01 wellnhofer@aevum.de Don't include ICU headers in public headers
2022-03-01 wellnhofer@aevum.de Remove broken bakefile support
2022-03-01 wellnhofer@aevum.de Remove broken Visual Studio 2010 support
2022-03-01 wellnhofer@aevum.de Remove broken Windows CE support
2022-02-28 wellnhofer@aevum.de Always fopen files with "rb"
2022-02-28 wellnhofer@aevum.de Remove __DJGPP__ checks
2022-02-28 wellnhofer@aevum.de Remove useless __CYGWIN__ checks
2021-12-20 wellnhofer@aevum.de Fix certain combinations of regex range quantifiers
2021-12-20 wellnhofer@aevum.de Fix range quantifier on subregex
2022-02-21 mike.dalessio@gmail.com Update `xmlStrlen()` to use POSIX / ISO C `strlen()`
2022-02-24 wellnhofer@aevum.de Fix build with older Python versions
2022-02-22 wellnhofer@aevum.de Fix unused variable warnings with disabled features
2022-02-22 wellnhofer@aevum.de Fix recovery from invalid HTML start tags
2022-02-22 wellnhofer@aevum.de More fixes to --without-valid build
2022-02-22 wellnhofer@aevum.de Fix --without-valid build
2022-02-20 wellnhofer@aevum.de Fix documentation in entities.c
2022-02-20 wellnhofer@aevum.de Add note about optimization flags
2022-02-20 wellnhofer@aevum.de Remove special configuration for certain maintainers
2022-02-20 wellnhofer@aevum.de Deprecate IDREF-related functions in valid.h
2022-02-20 wellnhofer@aevum.de Deprecate all functions in DOCBparser.h
2022-02-20 wellnhofer@aevum.de Disable docbook support by default
2022-02-20 wellnhofer@aevum.de Deprecate legacy functions
2022-02-20 wellnhofer@aevum.de Disable legacy support by default
2022-02-20 wellnhofer@aevum.de Deprecate all functions in nanoftp.h
2022-02-20 wellnhofer@aevum.de Disable FTP support by default
2022-02-20 wellnhofer@aevum.de Add XML_DEPRECATED macro
2022-02-20 wellnhofer@aevum.de Remove elfgcchack.h
2022-02-20 wellnhofer@aevum.de Only warn on invalid redeclarations of predefined entities
2022-02-08 wellnhofer@aevum.de Don't add IDs containing unexpanded entity references
2022-02-20 wellnhofer@aevum.de Remove unneeded code in xmlreader.c
2022-01-13 wellnhofer@aevum.de Rework validation context flags
2022-02-19 wellnhofer@aevum.de Release v2.9.13
2022-02-19 wellnhofer@aevum.de Update news and rebuild documentation
2022-02-08 wellnhofer@aevum.de [CVE-2022-23308] Use-after-free of ID and IDREF attributes
2022-02-19 wellnhofer@aevum.de Fix fuzz/.gitignore after fixing VPATH build
2022-02-17 wellnhofer@aevum.de Remove SVN keyword anchors
2022-02-16 wellnhofer@aevum.de Remove xmlwin32version.h
2022-02-14 wellnhofer@aevum.de Fix source URL in libxml.spec.in
2022-02-14 wellnhofer@aevum.de Fix fuzzer test with VPATH build
2022-02-14 wellnhofer@aevum.de Support custom prefix when installing Python module
2022-02-14 wellnhofer@aevum.de Remove Makefile.win
2022-02-14 wellnhofer@aevum.de Fix distribution after README change
2022-02-14 wellnhofer@aevum.de Rework README
2022-02-14 wellnhofer@aevum.de Remove README.cvs-commits
2022-02-14 wellnhofer@aevum.de Remove outdated ChangeLog code
2022-02-13 wellnhofer@aevum.de Remove CVS and SVN-related code
2022-02-13 wellnhofer@aevum.de Redirect links to xmlsoft.org
2022-02-13 wellnhofer@aevum.de Remove README.docs
2022-02-13 wellnhofer@aevum.de Remove MAINTAINERS
2022-02-13 wellnhofer@aevum.de Remove xmltutorial.pdf
2022-02-08 wellnhofer@aevum.de Fix regression in RelaxNG pattern matching
2022-02-12 wellnhofer@aevum.de Remove .travis.yml
2022-02-12 wellnhofer@aevum.de Try again to only build GitLab Pages on main repo
2022-02-12 wellnhofer@aevum.de Try again to only build GitLab Pages on main repo
2022-02-12 wellnhofer@aevum.de Only build GitLab Pages on main repo
2022-02-12 wellnhofer@aevum.de Upload documentation to GitLab pages
2022-01-26 wellnhofer@aevum.de Make xmlFuzzReadString return a zero size in error case
2022-02-07 wellnhofer@aevum.de Fix xmlSetTreeDoc with entity references
2022-02-07 wellnhofer@aevum.de Fix "xmllint -"
2022-02-07 wellnhofer@aevum.de Fix double counting of CRLF in comments
2022-02-07 wellnhofer@aevum.de Remove old ChangeLog
2022-02-07 wellnhofer@aevum.de Document how to escape XML_CATALOG_FILES
2022-02-07 wellnhofer@aevum.de Properly handle nested documents in xmlFreeNode
2022-02-07 wellnhofer@aevum.de Make sure to grow input buffer in xmlParseMisc
2022-02-04 wellnhofer@aevum.de Fix unused function warning in testapi.c
2022-02-04 wellnhofer@aevum.de Don't ignore xmllint options after "-"
2022-02-04 wellnhofer@aevum.de Don't normalize namespace URIs in XPointer xmlns() scheme
2022-02-03 wellnhofer@aevum.de Fix handling of XSD with empty namespace
2022-02-03 wellnhofer@aevum.de Update NewsML DTD in test suite
2022-02-01 wellnhofer@aevum.de Fix parsing of xmllint --maxmem option
2022-02-01 wellnhofer@aevum.de Also register HTML document nodes
2022-02-01 wellnhofer@aevum.de Add more checks for malloc failures in xmllint.c

Backport review link:
https://chromium-review.googlesource.com/c/chromium/src/+/3528473

Bug: 934413
Change-Id: I7b8716b17d84a6c0a8c140996968db8cfab08735
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 3 insertions, 5 deletions

diff --git a/chromium/third_party/libxml/src/uri.c b/chromium/third_party/libxml/src/uri.c
index ccc26aa5942..e5c790ebd91 100644
--- a/chromium/third_party/libxml/src/uri.c
+++ b/chromium/third_party/libxml/src/uri.c
@@ -2383,7 +2383,7 @@ xmlCanonicPath(const xmlChar *path)
  * For Windows implementations, additional work needs to be done to
  * replace backslashes in pathnames with "forward slashes"
  */
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
     int len = 0;
     char *p = NULL;
 #endif
@@ -2455,7 +2455,7 @@ xmlCanonicPath(const xmlChar *path)
 
 path_processing:
 /* For Windows implementations, replace backslashes with 'forward slashes' */
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
     /*
      * Create a URI structure
      */
@@ -2534,7 +2534,7 @@ xmlPathToURI(const xmlChar *path)
     cal = xmlCanonicPath(path);
     if (cal == NULL)
         return(NULL);
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
     /* xmlCanonicPath can return an URI on Windows (is that the intended behaviour?)
        If 'cal' is a valid URI already then we are done here, as continuing would make
        it invalid. */
@@ -2558,5 +2558,3 @@ xmlPathToURI(const xmlChar *path)
     xmlFree(cal);
     return(ret);
 }
-#define bottom_uri
-#include "elfgcchack.h"