Merge commit 'bc5a5d658320c37e206fe4e7b525b4a24466d0c6'

Author: Sibras

.gitignore

@@ -1,3 +1,4 @@
+*.exe
 *.o
 *.lo
 *.log
@@ -78,6 +79,7 @@ python/libxml2.py
 python/libxml2class.py
 python/libxml2class.txt
 python/libxml2mod.la
+python/setup.py
 python/tests/Makefile
 python/tests/Makefile.in
 python/tests/tmp.xml

.travis.yml

@@ -8,15 +8,14 @@ addons:
 matrix:
   include:
     # Try to emulate a C89 compiler on a POSIX system by disabling as many
-    # GNU extensions as possible. -Dlinux is required to make the weak
-    # pthread symbols work.
+    # GNU extensions as possible.
     - compiler: gcc
       env: CFLAGS="-O2 -std=c89 -D_POSIX_C_SOURCE=200809L"
     # clang with AddressSanitizer and UndefinedBehaviorSanitizer.
     - compiler: clang
       dist: trusty
       env: CONFIG="--without-python"
-           CFLAGS="-O2 -g -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover"
+           CFLAGS="-O2 -g -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=all"
            UBSAN_OPTIONS=print_stacktrace=1
 script: sh autogen.sh $CONFIG && make -j2 V=1 && make check
 git:

SAX2.c

@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
+#include <stddef.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
@@ -1914,7 +1915,7 @@ xmlSAX2TextNode(xmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
 	    else {
 	        ret->line = 65535;
 		if (ctxt->options & XML_PARSE_BIG_LINES)
-		    ret->psvi = (void *) (long) ctxt->input->line;
+		    ret->psvi = (void *) (ptrdiff_t) ctxt->input->line;
 	    }
 	}
     }

catalog.c

@@ -2396,6 +2396,7 @@ xmlParseSGMLCatalog(xmlCatalogPtr catal, const xmlChar *value,
 		case SGML_CATA_ENTITY:
 		    if (*cur == '%')
 			type = SGML_CATA_PENTITY;
+                    /* Falls through. */
 		case SGML_CATA_PENTITY:
 		case SGML_CATA_DOCTYPE:
 		case SGML_CATA_LINKTYPE:

configure.ac

@@ -9,7 +9,7 @@ AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=9
-LIBXML_MICRO_VERSION=6
+LIBXML_MICRO_VERSION=7
 LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
@@ -1053,9 +1053,9 @@ if test "$with_threads" = "no" ; then
 else
     echo Enabling multithreaded support
 
-    dnl Default to native threads on Win32
+    dnl Default to native threads on Windows
     case $host_os in
-       *mingw32*) if test "$with_threads" != "pthread" && test "$with_threads" != "no"; then
+       *mingw*) if test "$with_threads" != "pthread" && test "$with_threads" != "no"; then
                WITH_THREADS="1"
                THREADS_W32="1"
                THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"
@@ -1640,7 +1640,6 @@ case "$host" in
  CPPFLAGS="$CPPFLAGS -DWIN32"
  WIN32_EXTRA_LIBADD="-lws2_32"
  WIN32_EXTRA_LDFLAGS="-no-undefined"
- AC_DEFINE([_WINSOCKAPI_],1,[Using the Win32 Socket implementation])
  if test "${PYTHON}" != ""
  then
    WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython$(echo ${PYTHON_VERSION} | tr -d .)"

dict.c

@@ -48,7 +48,7 @@
 #else
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
-#elif defined(WIN32)
+#elif defined(_WIN32)
 typedef unsigned __int32 uint32_t;
 #endif
 #endif
@@ -249,7 +249,7 @@ xmlDictAddString(xmlDictPtr dict, const xmlChar *name, unsigned int namelen) {
 #endif
     pool = dict->strings;
     while (pool != NULL) {
-	if (pool->end - pool->free > namelen)
+	if ((size_t)(pool->end - pool->free) > namelen)
 	    goto found_pool;
 	if (pool->size > size) size = pool->size;
         limit += pool->size;
@@ -317,7 +317,7 @@ xmlDictAddQString(xmlDictPtr dict, const xmlChar *prefix, unsigned int plen,
 #endif
     pool = dict->strings;
     while (pool != NULL) {
-	if (pool->end - pool->free > namelen + plen + 1)
+	if ((size_t)(pool->end - pool->free) > namelen + plen + 1)
 	    goto found_pool;
 	if (pool->size > size) size = pool->size;
         limit += pool->size;
@@ -453,14 +453,23 @@ xmlDictComputeFastKey(const xmlChar *name, int namelen, int seed) {
     }
     switch (namelen) {
         case 10: value += name[9];
+        /* Falls through. */
         case 9: value += name[8];
+        /* Falls through. */
         case 8: value += name[7];
+        /* Falls through. */
         case 7: value += name[6];
+        /* Falls through. */
         case 6: value += name[5];
+        /* Falls through. */
         case 5: value += name[4];
+        /* Falls through. */
         case 4: value += name[3];
+        /* Falls through. */
         case 3: value += name[2];
+        /* Falls through. */
         case 2: value += name[1];
+        /* Falls through. */
         default: break;
     }
     return(value);
@@ -496,15 +505,25 @@ xmlDictComputeFastQKey(const xmlChar *prefix, int plen,
     }
     switch (plen) {
         case 10: value += prefix[9];
+        /* Falls through. */
         case 9: value += prefix[8];
+        /* Falls through. */
         case 8: value += prefix[7];
+        /* Falls through. */
         case 7: value += prefix[6];
+        /* Falls through. */
         case 6: value += prefix[5];
+        /* Falls through. */
         case 5: value += prefix[4];
+        /* Falls through. */
         case 4: value += prefix[3];
+        /* Falls through. */
         case 3: value += prefix[2];
+        /* Falls through. */
         case 2: value += prefix[1];
+        /* Falls through. */
         case 1: value += prefix[0];
+        /* Falls through. */
         default: break;
     }
     len -= plen;
@@ -514,15 +533,25 @@ xmlDictComputeFastQKey(const xmlChar *prefix, int plen,
     }
     switch (len) {
         case 10: value += name[9];
+        /* Falls through. */
         case 9: value += name[8];
+        /* Falls through. */
         case 8: value += name[7];
+        /* Falls through. */
         case 7: value += name[6];
+        /* Falls through. */
         case 6: value += name[5];
+        /* Falls through. */
         case 5: value += name[4];
+        /* Falls through. */
         case 4: value += name[3];
+        /* Falls through. */
         case 3: value += name[2];
+        /* Falls through. */
         case 2: value += name[1];
+        /* Falls through. */
         case 1: value += name[0];
+        /* Falls through. */
         default: break;
     }
     return(value);

doc/Makefile.am

@@ -243,7 +243,7 @@ docs: web $(top_builddir)/NEWS libxml2.xsa $(man_MANS)
 
 api: libxml2-api.xml libxml2-refs.xml $(APIPAGES) $(srcdir)/html/index.html $(WIN32_DIR)/libxml2.def.src ../elfgcchack.h $(srcdir)/site.xsl
 
-web: $(PAGES)
+web: $(PAGES) xmllint.html xmlcatalog_man.html
 
 ../elfgcchack.h: $(srcdir)/elfgcchack.xsl $(srcdir)/libxml2-api.xml
 	-@(if [ -x $(XSLTPROC) ] ; then \
@@ -314,9 +314,15 @@ libxml2-api.xml libxml2-refs.xml ../libxml2.syms: apibuild.py symbols.xml syms.x
 xmllint.1: xmllint.xml
 	-@($(XSLTPROC) --nonet xmllint.xml)
 
+xmllint.html: xmllint.xml
+	-@($(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl xmllint.xml)
+
 xmlcatalog.1: xmlcatalog_man.xml
 	-@($(XSLTPROC) --nonet xmlcatalog_man.xml)
 
+xmlcatalog_man.html: xmlcatalog_man.xml
+	-@($(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl xmlcatalog_man.xml)
+
 check-extra-dist:
 	for f in $(EXTRA_DIST_wc) ; do echo $$f; done | sort -u >tmp.EXTRA_DIST_wc
 	for f in $(EXTRA_DIST) ;    do echo $$f; done | sort    >tmp.EXTRA_DIST

doc/elfgcchack.xsl

@@ -18,7 +18,7 @@
 #ifdef IN_LIBXML
 #ifdef __GNUC__
 #ifdef PIC
-#ifdef linux
+#ifdef __linux__
 #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3)
 
 #include "libxml/c14n.h"

doc/libxml2.xsa

@@ -8,125 +8,24 @@
   </vendor>
   <product id="libxml2">
     <name>libxml2</name>
-    <version>v2.9.5</version>
-    <last-release> Sep 04 2017</last-release>
+    <version>v2.9.6</version>
+    <last-release> Oct 06 2017</last-release>
     <info-url>http://xmlsoft.org/</info-url>
-    <changes>   - Security:
-  Detect infinite recursion in parameter entities (Nick Wellnhofer),
-  Fix handling of parameter-entity references (Nick Wellnhofer),
-  Disallow namespace nodes in XPointer ranges (Nick Wellnhofer),
-  Fix XPointer paths beginning with range-to (Nick Wellnhofer)
-  
-   - Documentation:
-  Documentation fixes (Nick Wellnhofer),
-  Spelling and grammar fixes (Nick Wellnhofer)
-  
-   - Portability:
-  Adding README.zOS to list of extra files for the release (Daniel Veillard),
-  Description of work needed to compile on zOS (Stéphane Michaut),
-  Porting libxml2 on zOS encoding of code (Stéphane Michaut),
-  small changes for OS/400 (Patrick Monnerat),
-  relaxng.c, xmlschemas.c: Fix build on pre-C99 compilers (Chun-wei Fan)
+    <changes>   - Portability:
+  Change preprocessor OS tests to __linux__ (Nick Wellnhofer)
 
    - Bug Fixes:
-  Problem resolving relative URIs (Daniel Veillard),
-  Fix unwanted warnings when switching encodings (Nick Wellnhofer),
-  Fix signature of xmlSchemaAugmentImportedIDC (Daniel Veillard),
-  Heap-buffer-overflow read of size 1 in xmlFAParsePosCharGroup (David Kilzer),
-  Fix NULL pointer deref in xmlFAParseCharClassEsc (Nick Wellnhofer),
-  Fix infinite loops with push parser in recovery mode (Nick Wellnhofer),
-  Send xmllint usage error to stderr (Nick Wellnhofer),
-  Fix NULL deref in xmlParseExternalEntityPrivate (Nick Wellnhofer),
-  Make sure not to call IS_BLANK_CH when parsing the DTD (Nick Wellnhofer),
-  Fix xmlHaltParser (Nick Wellnhofer),
-  Fix pathological performance when outputting charrefs (Nick Wellnhofer),
-  Fix invalid-source-encoding warnings in testWriter.c (Nick Wellnhofer),
-  Fix duplicate SAX callbacks for entity content (David Kilzer),
-  Treat URIs with scheme as absolute in C14N (Nick Wellnhofer),
-  Fix copy-paste errors in error messages (Nick Wellnhofer),
-  Fix sanity check in htmlParseNameComplex (Nick Wellnhofer),
-  Fix potential infinite loop in xmlStringLenDecodeEntities (Nick Wellnhofer),
-  Reset parser input pointers on encoding failure (Nick Wellnhofer),
-  Fix memory leak in xmlParseEntityDecl error path (Nick Wellnhofer),
-  Fix xmlBuildRelativeURI for URIs starting with './' (Nick Wellnhofer),
-  Fix type confusion in xmlValidateOneNamespace (Nick Wellnhofer),
-  Fix memory leak in xmlStringLenGetNodeList (Nick Wellnhofer),
-  Fix NULL pointer deref in xmlDumpElementContent (Daniel Veillard),
-  Fix memory leak in xmlBufAttrSerializeTxtContent (Nick Wellnhofer),
-  Stop parser on unsupported encodings (Nick Wellnhofer),
-  Check for integer overflow in memory debug code (Nick Wellnhofer),
-  Fix buffer size checks in xmlSnprintfElementContent (Nick Wellnhofer),
-  Avoid reparsing in xmlParseStartTag2 (Nick Wellnhofer),
-  Fix undefined behavior in xmlRegExecPushStringInternal (Nick Wellnhofer),
-  Check XPath exponents for overflow (Nick Wellnhofer),
-  Check for overflow in xmlXPathIsPositionalPredicate (Nick Wellnhofer),
-  Fix spurious error message (Nick Wellnhofer),
-  Fix memory leak in xmlCanonicPath (Nick Wellnhofer),
-  Fix memory leak in xmlXPathCompareNodeSetValue (Nick Wellnhofer),
-  Fix memory leak in pattern error path (Nick Wellnhofer),
-  Fix memory leak in parser error path (Nick Wellnhofer),
-  Fix memory leaks in XPointer error paths (Nick Wellnhofer),
-  Fix memory leak in xmlXPathNodeSetMergeAndClear (Nick Wellnhofer),
-  Fix memory leak in XPath filter optimizations (Nick Wellnhofer),
-  Fix memory leaks in XPath error paths (Nick Wellnhofer),
-  Do not leak the new CData node if adding fails (David Tardon),
-  Prevent unwanted external entity reference (Neel Mehta),
-  Increase buffer space for port in HTTP redirect support (Daniel Veillard),
-  Fix more NULL pointer derefs in xpointer.c (Nick Wellnhofer),
-  Avoid function/data pointer conversion in xpath.c (Nick Wellnhofer),
-  Fix format string warnings (Nick Wellnhofer),
-  Disallow namespace nodes in XPointer points (Nick Wellnhofer),
-  Fix comparison with root node in xmlXPathCmpNodes (Nick Wellnhofer),
-  Fix attribute decoding during XML schema validation (Alex Henrie),
-  Fix NULL pointer deref in XPointer range-to (Nick Wellnhofer)
-  
-   - Improvements:
-  Updating the spec file to reflect Fedora 24 (Daniel Veillard),
-  Add const in five places to move 1 KiB to .rdata (Bruce Dawson),
-  Fix missing part of comment for function xmlXPathEvalExpression() (Daniel Veillard),
-  Get rid of "blanks wrapper" for parameter entities (Nick Wellnhofer),
-  Simplify handling of parameter entity references (Nick Wellnhofer),
-  Deduplicate code in encoding.c (Nick Wellnhofer),
-  Make HTML parser functions take const pointers (Nick Wellnhofer),
-  Build test programs only when needed (Nick Wellnhofer),
-  Fix doc/examples/index.py (Nick Wellnhofer),
-  Fix compiler warnings in threads.c (Nick Wellnhofer),
-  Fix empty-body warning in nanohttp.c (Nick Wellnhofer),
-  Fix cast-align warnings (Nick Wellnhofer),
-  Fix unused-parameter warnings (Nick Wellnhofer),
-  Rework entity boundary checks (Nick Wellnhofer),
-  Don't switch encoding for internal parameter entities (Nick Wellnhofer),
-  Merge duplicate code paths handling PE references (Nick Wellnhofer),
-  Test SAX2 callbacks with entity substitution (Nick Wellnhofer),
-  Support catalog and threads tests under --without-sax1 (Nick Wellnhofer),
-  Misc fixes for 'make tests' (Nick Wellnhofer),
-  Initialize keepBlanks in HTML parser (Nick Wellnhofer),
-  Add test cases for bug 758518 (David Kilzer),
-  Fix compiler warning in htmlParseElementInternal (Nick Wellnhofer),
-  Remove useless check in xmlParseAttributeListDecl (Nick Wellnhofer),
-  Allow zero sized memory input buffers (Nick Wellnhofer),
-  Add TODO comment in xmlSwitchEncoding (Nick Wellnhofer),
-  Check for integer overflow in xmlXPathFormatNumber (Nick Wellnhofer),
-  Make Travis print UBSan stacktraces (Nick Wellnhofer),
-  Add .travis.yml (Nick Wellnhofer),
-  Fix expected error output in Python tests (Nick Wellnhofer),
-  Simplify control flow in xmlParseStartTag2 (Nick Wellnhofer),
-  Disable LeakSanitizer when running API tests (Nick Wellnhofer),
-  Avoid out-of-bound array access in API tests (Nick Wellnhofer),
-  Avoid spurious UBSan errors in parser.c (Nick Wellnhofer),
-  Parse small XPath numbers more accurately (Nick Wellnhofer),
-  Rework XPath rounding functions (Nick Wellnhofer),
-  Fix white space in test output (Nick Wellnhofer),
-  Fix axis traversal from attribute and namespace nodes (Nick Wellnhofer),
-  Check for trailing characters in XPath expressions earlier (Nick Wellnhofer),
-  Rework final handling of XPath results (Nick Wellnhofer),
-  Make xmlXPathEvalExpression call xmlXPathEval (Nick Wellnhofer),
-  Remove unused variables (Nick Wellnhofer),
-  Don't print generic error messages in XPath tests (Nick Wellnhofer)
-  
-   - Cleanups:
-  Fix a couple of misleading indentation errors (Daniel Veillard),
-  Remove unnecessary calls to xmlPopInput (Nick Wellnhofer)
+  Fix XPath stack frame logic (Nick Wellnhofer),
+  Report undefined XPath variable error message (Nick Wellnhofer),
+  Fix regression with librsvg (Nick Wellnhofer),
+  Handle more invalid entity values in recovery mode (Nick Wellnhofer),
+  Fix structured validation errors (Nick Wellnhofer),
+  Fix memory leak in LZMA decompressor (Nick Wellnhofer),
+  Set memory limit for LZMA decompression (Nick Wellnhofer),
+  Handle illegal entity values in recovery mode (Nick Wellnhofer),
+  Fix debug dump of streaming XPath expressions (Nick Wellnhofer),
+  Fix memory leak in nanoftp (Nick Wellnhofer),
+  Fix memory leaks in SAX1 parser (Nick Wellnhofer)
 
 
 </changes>