https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1dbad942d88f433d54a695364ece75127a411773
commit 1dbad942d88f433d54a695364ece75127a411773 Author: Thomas Faber <[email protected]> AuthorDate: Sun Nov 20 10:42:25 2022 -0500 Commit: Thomas Faber <[email protected]> CommitDate: Fri Nov 25 09:30:39 2022 -0500 [LIBXML2] Update to version 2.10.2. CORE-17766 --- media/doc/3rd Party Files.txt | 2 +- sdk/lib/3rdparty/libxml2/NEWS | 17 +++++++++++++++++ sdk/lib/3rdparty/libxml2/config.h | 12 +++++++----- sdk/lib/3rdparty/libxml2/tree.c | 3 ++- sdk/lib/3rdparty/libxml2/xpath.c | 3 +-- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index c7747fee0a7..19ff836c6f7 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -239,7 +239,7 @@ URL: https://github.com/win-iconv/win-iconv Title: LibXML Path: sdk/lib/3rdparty/libxml2 -Used Version: 2.10.1 +Used Version: 2.10.2 License: MIT (https://spdx.org/licenses/MIT.htmlf) URL: http://xmlsoft.org, ftp://xmlsoft.org/libxml2/ diff --git a/sdk/lib/3rdparty/libxml2/NEWS b/sdk/lib/3rdparty/libxml2/NEWS index 5f562a2f21b..7e35a4d8a56 100644 --- a/sdk/lib/3rdparty/libxml2/NEWS +++ b/sdk/lib/3rdparty/libxml2/NEWS @@ -1,5 +1,22 @@ NEWS file for libxml2 +v2.10.2: Aug 29 2022 + +### Improvements + +- Remove set-but-unused variable in xmlXPathScanName +- Silence -Warray-bounds warning + +### Build system + +- build: require automake-1.16.3 or later (Xi Ruoyao) +- Remove generated files from distribution + +### Test suite + +- Don't create missing.xml when running testapi + + v2.10.1: Aug 25 2022 ### Regressions diff --git a/sdk/lib/3rdparty/libxml2/config.h b/sdk/lib/3rdparty/libxml2/config.h index a023d17d997..ec153ccf56c 100644 --- a/sdk/lib/3rdparty/libxml2/config.h +++ b/sdk/lib/3rdparty/libxml2/config.h @@ -55,9 +55,6 @@ /* Define to 1 if you have the <lzma.h> header file. */ /* #undef HAVE_LZMA_H */ -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - /* Define to 1 if you have the `mmap' function. */ /* #undef HAVE_MMAP */ @@ -102,6 +99,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 +/* Define to 1 if you have the <stdio.h> header file. */ +#define HAVE_STDIO_H 1 + /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 @@ -174,7 +174,9 @@ /* Type cast for the send() function 2nd arg */ #define SEND_ARG2_CAST -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 /* Support for IPv6 */ @@ -184,7 +186,7 @@ /* #undef VA_LIST_IS_ARRAY */ /* Version number of package */ -#define VERSION "2.10.1" +#define VERSION "2.10.2" /* Determine what socket length (socklen_t) data type is */ #define XML_SOCKLEN_T int diff --git a/sdk/lib/3rdparty/libxml2/tree.c b/sdk/lib/3rdparty/libxml2/tree.c index b53fa37ef41..4c9f00d784e 100644 --- a/sdk/lib/3rdparty/libxml2/tree.c +++ b/sdk/lib/3rdparty/libxml2/tree.c @@ -9604,7 +9604,8 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt, /* * Attributes (xmlAttr). */ - clone = (xmlNodePtr) xmlMalloc(sizeof(xmlAttr)); + /* Use xmlRealloc to avoid -Warray-bounds warning */ + clone = (xmlNodePtr) xmlRealloc(NULL, sizeof(xmlAttr)); if (clone == NULL) { xmlTreeErrMemory("xmlDOMWrapCloneNode(): allocating an attr-node"); goto internal_error; diff --git a/sdk/lib/3rdparty/libxml2/xpath.c b/sdk/lib/3rdparty/libxml2/xpath.c index 4a6f0e216e7..fbee6a52b12 100644 --- a/sdk/lib/3rdparty/libxml2/xpath.c +++ b/sdk/lib/3rdparty/libxml2/xpath.c @@ -10503,7 +10503,7 @@ xmlXPathCompFilterExpr(xmlXPathParserContextPtr ctxt) { static xmlChar * xmlXPathScanName(xmlXPathParserContextPtr ctxt) { - int len = 0, l; + int l; int c; const xmlChar *cur; xmlChar *ret; @@ -10523,7 +10523,6 @@ xmlXPathScanName(xmlXPathParserContextPtr ctxt) { (c == '_') || (c == ':') || (IS_COMBINING(c)) || (IS_EXTENDER(c)))) { - len += l; NEXTL(l); c = CUR_CHAR(l); }
