mirror of
https://github.com/reactos/reactos.git
synced 2025-08-02 05:55:42 +00:00
[LIBXML2] Update to version 2.10.1. CORE-17766
This commit is contained in:
parent
3f3714bad4
commit
0d5a4166a4
6 changed files with 39 additions and 42 deletions
27
sdk/lib/3rdparty/libxml2/HTMLparser.c
vendored
27
sdk/lib/3rdparty/libxml2/HTMLparser.c
vendored
|
@ -5056,8 +5056,7 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
|
|||
htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
|
||||
return(-1);
|
||||
}
|
||||
else
|
||||
memset(sax, 0, sizeof(htmlSAXHandler));
|
||||
memset(sax, 0, sizeof(htmlSAXHandler));
|
||||
|
||||
/* Allocate the Input stack */
|
||||
ctxt->inputTab = (htmlParserInputPtr *)
|
||||
|
@ -5116,11 +5115,9 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
|
|||
ctxt->nodeInfoNr = 0;
|
||||
ctxt->nodeInfoMax = 0;
|
||||
|
||||
if (sax == NULL) ctxt->sax = (xmlSAXHandlerPtr) &htmlDefaultSAXHandler;
|
||||
else {
|
||||
ctxt->sax = sax;
|
||||
memcpy(sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1));
|
||||
}
|
||||
ctxt->sax = sax;
|
||||
xmlSAX2InitHtmlDefaultSAXHandler(sax);
|
||||
|
||||
ctxt->userData = ctxt;
|
||||
ctxt->myDoc = NULL;
|
||||
ctxt->wellFormed = 1;
|
||||
|
@ -7116,22 +7113,10 @@ htmlDocPtr
|
|||
htmlCtxtReadDoc(htmlParserCtxtPtr ctxt, const xmlChar * cur,
|
||||
const char *URL, const char *encoding, int options)
|
||||
{
|
||||
xmlParserInputPtr stream;
|
||||
|
||||
if (cur == NULL)
|
||||
return (NULL);
|
||||
if (ctxt == NULL)
|
||||
return (NULL);
|
||||
xmlInitParser();
|
||||
|
||||
htmlCtxtReset(ctxt);
|
||||
|
||||
stream = xmlNewStringInputStream(ctxt, cur);
|
||||
if (stream == NULL) {
|
||||
return (NULL);
|
||||
}
|
||||
inputPush(ctxt, stream);
|
||||
return (htmlDoRead(ctxt, URL, encoding, options, 1));
|
||||
return (htmlCtxtReadMemory(ctxt, (const char *) cur, xmlStrlen(cur), URL,
|
||||
encoding, options));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
24
sdk/lib/3rdparty/libxml2/NEWS
vendored
24
sdk/lib/3rdparty/libxml2/NEWS
vendored
|
@ -1,5 +1,29 @@
|
|||
NEWS file for libxml2
|
||||
|
||||
v2.10.1: Aug 25 2022
|
||||
|
||||
### Regressions
|
||||
|
||||
- Fix xmlCtxtReadDoc with encoding
|
||||
|
||||
### Bug fixes
|
||||
|
||||
- Fix HTML parser with threads and --without-legacy
|
||||
|
||||
### Build system
|
||||
|
||||
- Fix build with Python 3.10
|
||||
- cmake: Disable version script on macOS
|
||||
- Remove Makefile rule to build testapi.c
|
||||
|
||||
### Documentation
|
||||
|
||||
- Switch back to HTML output for API documentation
|
||||
- Port doc/examples/index.py to Python 3
|
||||
- Fix order of exports in libxml2-api.xml
|
||||
- Remove libxml2-refs.xml
|
||||
|
||||
|
||||
v2.10.0: Aug 17 2022
|
||||
|
||||
### Security
|
||||
|
|
2
sdk/lib/3rdparty/libxml2/config.h
vendored
2
sdk/lib/3rdparty/libxml2/config.h
vendored
|
@ -184,7 +184,7 @@
|
|||
/* #undef VA_LIST_IS_ARRAY */
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "2.10.0"
|
||||
#define VERSION "2.10.1"
|
||||
|
||||
/* Determine what socket length (socklen_t) data type is */
|
||||
#define XML_SOCKLEN_T int
|
||||
|
|
16
sdk/lib/3rdparty/libxml2/parser.c
vendored
16
sdk/lib/3rdparty/libxml2/parser.c
vendored
|
@ -15359,22 +15359,10 @@ xmlDocPtr
|
|||
xmlCtxtReadDoc(xmlParserCtxtPtr ctxt, const xmlChar * cur,
|
||||
const char *URL, const char *encoding, int options)
|
||||
{
|
||||
xmlParserInputPtr stream;
|
||||
|
||||
if (cur == NULL)
|
||||
return (NULL);
|
||||
if (ctxt == NULL)
|
||||
return (NULL);
|
||||
xmlInitParser();
|
||||
|
||||
xmlCtxtReset(ctxt);
|
||||
|
||||
stream = xmlNewStringInputStream(ctxt, cur);
|
||||
if (stream == NULL) {
|
||||
return (NULL);
|
||||
}
|
||||
inputPush(ctxt, stream);
|
||||
return (xmlDoRead(ctxt, URL, encoding, options, 1));
|
||||
return (xmlCtxtReadMemory(ctxt, (const char *) cur, xmlStrlen(cur), URL,
|
||||
encoding, options));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue