Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 13:06:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LIBXML2] Update to version 2.9.9. CORE-15854

Browse source
This commit is contained in:
Thomas Faber 2019-03-12 10:19:35 +01:00
parent 743951eccf
commit 1fe58c4058
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
22 changed files with 291 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

2
media/doc/3rd Party Files.txt
View file

@ -43,7 +43,7 @@ Used Version: 1.0.6
Website: http://www.bzip.org Website: http://www.bzip.org
Title: LibXML Title: LibXML
Used Version: 2.9.8 Used Version: 2.9.9
Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/
Title: Libxslt Title: Libxslt

1
sdk/include/reactos/libs/libxml/globals.h
View file

@ -17,7 +17,6 @@
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/xmlerror.h> #include <libxml/xmlerror.h>
#include <libxml/SAX.h>
#include <libxml/SAX2.h> #include <libxml/SAX2.h>
#include <libxml/xmlmemory.h> #include <libxml/xmlmemory.h>

2
sdk/include/reactos/libs/libxml/tree.h
View file

@ -575,7 +575,7 @@ struct _xmlDoc {
void *ids; /* Hash table for ID attributes if any */ void *ids; /* Hash table for ID attributes if any */
void *refs; /* Hash table for IDREFs attributes if any */ void *refs; /* Hash table for IDREFs attributes if any */
const xmlChar *URL; /* The URI for that document */ const xmlChar *URL; /* The URI for that document */
int charset; /* encoding of the in-memory content int charset; /* Internal flag for charset handling,
actually an xmlCharEncoding */ actually an xmlCharEncoding */
struct _xmlDict *dict; /* dict used to allocate names or NULL */ struct _xmlDict *dict; /* dict used to allocate names or NULL */
void *psvi; /* for type/PSVI informations */ void *psvi; /* for type/PSVI informations */

6
sdk/include/reactos/libs/libxml/xmlexports.h
View file

@ -131,8 +131,8 @@
#endif #endif
#endif #endif
/* Cygwin platform, GNU compiler */ /* Cygwin platform (does not define _WIN32), GNU compiler */
#if defined(_WIN32) && defined(__CYGWIN__) #if defined(__CYGWIN__)
#undef XMLPUBFUN #undef XMLPUBFUN
#undef XMLPUBVAR #undef XMLPUBVAR
#undef XMLCALL #undef XMLCALL
@ -145,7 +145,7 @@
#if !defined(LIBXML_STATIC) #if !defined(LIBXML_STATIC)
#define XMLPUBVAR __declspec(dllimport) extern #define XMLPUBVAR __declspec(dllimport) extern
#else #else
#define XMLPUBVAR #define XMLPUBVAR extern
#endif #endif
#endif #endif
#define XMLCALL __cdecl #define XMLCALL __cdecl

10
sdk/include/reactos/libs/libxml/xmlversion.h
View file

@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
* *
* the version string like "1.2.3" * the version string like "1.2.3"
*/ */
#define LIBXML_DOTTED_VERSION "2.9.8" #define LIBXML_DOTTED_VERSION "2.9.9"
/** /**
* LIBXML_VERSION: * LIBXML_VERSION:
* *
* the version number: 1.2.3 value is 10203 * the version number: 1.2.3 value is 10203
*/ */
#define LIBXML_VERSION 20908 #define LIBXML_VERSION 20909
/** /**
* LIBXML_VERSION_STRING: * LIBXML_VERSION_STRING:
* *
* the version number string, 1.2.3 value is "10203" * the version number string, 1.2.3 value is "10203"
*/ */
#define LIBXML_VERSION_STRING "20908" #define LIBXML_VERSION_STRING "20909"
/** /**
* LIBXML_VERSION_EXTRA: * LIBXML_VERSION_EXTRA:
* *
* extra version information, used to show a CVS compilation * extra version information, used to show a CVS compilation
*/ */
#define LIBXML_VERSION_EXTRA "-GITv2.9.8-rc1-2-gd910e99c3" #define LIBXML_VERSION_EXTRA "-GITv2.9.9-rc2-2-g7c4949afa"
/** /**
* LIBXML_TEST_VERSION: * LIBXML_TEST_VERSION:
@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
* Macro to check that the libxml version in use is compatible with * Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against * the version the software has been compiled against
*/ */
#define LIBXML_TEST_VERSION xmlCheckVersion(20908); #define LIBXML_TEST_VERSION xmlCheckVersion(20909);
#ifndef VMS #ifndef VMS
#if 0 #if 0

6
sdk/lib/3rdparty/libxml2/HTMLparser.c vendored
View file

@ -1084,7 +1084,7 @@ static const char * const htmlStartClose[] = {
"menu", "p", "head", "ul", NULL, "menu", "p", "head", "ul", NULL,
"p", "p", "head", "h1", "h2", "h3", "h4", "h5", "h6", FONTSTYLE, NULL, "p", "p", "head", "h1", "h2", "h3", "h4", "h5", "h6", FONTSTYLE, NULL,
"div", "p", "head", NULL, "div", "p", "head", NULL,
"noscript", "p", NULL, "noscript", "script", NULL,
"center", "font", "b", "i", "p", "head", NULL, "center", "font", "b", "i", "p", "head", NULL,
"a", "a", "head", NULL, "a", "a", "head", NULL,
"caption", "p", NULL, "caption", "p", NULL,
@ -3635,13 +3635,13 @@ htmlCheckEncodingDirect(htmlParserCtxtPtr ctxt, const xmlChar *encoding) {
*/ */
processed = ctxt->input->cur - ctxt->input->base; processed = ctxt->input->cur - ctxt->input->base;
xmlBufShrink(ctxt->input->buf->buffer, processed); xmlBufShrink(ctxt->input->buf->buffer, processed);
nbchars = xmlCharEncInput(ctxt->input->buf, 0); nbchars = xmlCharEncInput(ctxt->input->buf, 1);
xmlBufResetInput(ctxt->input->buf->buffer, ctxt->input);
if (nbchars < 0) { if (nbchars < 0) {
htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING, htmlParseErr(ctxt, XML_ERR_INVALID_ENCODING,
"htmlCheckEncoding: encoder error\n", "htmlCheckEncoding: encoder error\n",
NULL, NULL); NULL, NULL);
} }
xmlBufResetInput(ctxt->input->buf->buffer, ctxt->input);
} }
} }
} }

60
sdk/lib/3rdparty/libxml2/HTMLtree.c vendored
View file

@ -502,8 +502,7 @@ htmlNodeDumpFileFormat(FILE *out, xmlDocPtr doc,
if (handler == NULL) if (handler == NULL)
htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding); htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding);
} }
} } else {
/* /*
* Fallback to HTML or ASCII when the encoding is unspecified * Fallback to HTML or ASCII when the encoding is unspecified
*/ */
@ -511,6 +510,7 @@ htmlNodeDumpFileFormat(FILE *out, xmlDocPtr doc,
handler = xmlFindCharEncodingHandler("HTML"); handler = xmlFindCharEncodingHandler("HTML");
if (handler == NULL) if (handler == NULL)
handler = xmlFindCharEncodingHandler("ascii"); handler = xmlFindCharEncodingHandler("ascii");
}
/* /*
* save the content to a temp buffer. * save the content to a temp buffer.
@ -570,25 +570,13 @@ htmlDocDumpMemoryFormat(xmlDocPtr cur, xmlChar**mem, int *size, int format) {
xmlCharEncoding enc; xmlCharEncoding enc;
enc = xmlParseCharEncoding(encoding); enc = xmlParseCharEncoding(encoding);
if (enc != cur->charset) { if (enc != XML_CHAR_ENCODING_UTF8) {
if (cur->charset != XML_CHAR_ENCODING_UTF8) {
/*
* Not supported yet
*/
*mem = NULL;
*size = 0;
return;
}
handler = xmlFindCharEncodingHandler(encoding); handler = xmlFindCharEncodingHandler(encoding);
if (handler == NULL) if (handler == NULL)
htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding); htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding);
}
} else { } else {
handler = xmlFindCharEncodingHandler(encoding);
}
}
/* /*
* Fallback to HTML or ASCII when the encoding is unspecified * Fallback to HTML or ASCII when the encoding is unspecified
*/ */
@ -596,6 +584,7 @@ htmlDocDumpMemoryFormat(xmlDocPtr cur, xmlChar**mem, int *size, int format) {
handler = xmlFindCharEncodingHandler("HTML"); handler = xmlFindCharEncodingHandler("HTML");
if (handler == NULL) if (handler == NULL)
handler = xmlFindCharEncodingHandler("ascii"); handler = xmlFindCharEncodingHandler("ascii");
}
buf = xmlAllocOutputBufferInternal(handler); buf = xmlAllocOutputBufferInternal(handler);
if (buf == NULL) { if (buf == NULL) {
@ -1101,22 +1090,12 @@ htmlDocDump(FILE *f, xmlDocPtr cur) {
xmlCharEncoding enc; xmlCharEncoding enc;
enc = xmlParseCharEncoding(encoding); enc = xmlParseCharEncoding(encoding);
if (enc != cur->charset) { if (enc != XML_CHAR_ENCODING_UTF8) {
if (cur->charset != XML_CHAR_ENCODING_UTF8) {
/*
* Not supported yet
*/
return(-1);
}
handler = xmlFindCharEncodingHandler(encoding); handler = xmlFindCharEncodingHandler(encoding);
if (handler == NULL) if (handler == NULL)
htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding); htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding);
}
} else { } else {
handler = xmlFindCharEncodingHandler(encoding);
}
}
/* /*
* Fallback to HTML or ASCII when the encoding is unspecified * Fallback to HTML or ASCII when the encoding is unspecified
*/ */
@ -1124,6 +1103,7 @@ htmlDocDump(FILE *f, xmlDocPtr cur) {
handler = xmlFindCharEncodingHandler("HTML"); handler = xmlFindCharEncodingHandler("HTML");
if (handler == NULL) if (handler == NULL)
handler = xmlFindCharEncodingHandler("ascii"); handler = xmlFindCharEncodingHandler("ascii");
}
buf = xmlOutputBufferCreateFile(f, handler); buf = xmlOutputBufferCreateFile(f, handler);
if (buf == NULL) return(-1); if (buf == NULL) return(-1);
@ -1160,20 +1140,12 @@ htmlSaveFile(const char *filename, xmlDocPtr cur) {
xmlCharEncoding enc; xmlCharEncoding enc;
enc = xmlParseCharEncoding(encoding); enc = xmlParseCharEncoding(encoding);
if (enc != cur->charset) { if (enc != XML_CHAR_ENCODING_UTF8) {
if (cur->charset != XML_CHAR_ENCODING_UTF8) {
/*
* Not supported yet
*/
return(-1);
}
handler = xmlFindCharEncodingHandler(encoding); handler = xmlFindCharEncodingHandler(encoding);
if (handler == NULL) if (handler == NULL)
htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding); htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding);
} }
} } else {
/* /*
* Fallback to HTML or ASCII when the encoding is unspecified * Fallback to HTML or ASCII when the encoding is unspecified
*/ */
@ -1181,6 +1153,7 @@ htmlSaveFile(const char *filename, xmlDocPtr cur) {
handler = xmlFindCharEncodingHandler("HTML"); handler = xmlFindCharEncodingHandler("HTML");
if (handler == NULL) if (handler == NULL)
handler = xmlFindCharEncodingHandler("ascii"); handler = xmlFindCharEncodingHandler("ascii");
}
/* /*
* save the content to a temp buffer. * save the content to a temp buffer.
@ -1221,14 +1194,7 @@ htmlSaveFileFormat(const char *filename, xmlDocPtr cur,
xmlCharEncoding enc; xmlCharEncoding enc;
enc = xmlParseCharEncoding(encoding); enc = xmlParseCharEncoding(encoding);
if (enc != cur->charset) { if (enc != XML_CHAR_ENCODING_UTF8) {
if (cur->charset != XML_CHAR_ENCODING_UTF8) {
/*
* Not supported yet
*/
return(-1);
}
handler = xmlFindCharEncodingHandler(encoding); handler = xmlFindCharEncodingHandler(encoding);
if (handler == NULL) if (handler == NULL)
htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding); htmlSaveErr(XML_SAVE_UNKNOWN_ENCODING, NULL, encoding);
@ -1236,7 +1202,6 @@ htmlSaveFileFormat(const char *filename, xmlDocPtr cur,
htmlSetMetaEncoding(cur, (const xmlChar *) encoding); htmlSetMetaEncoding(cur, (const xmlChar *) encoding);
} else { } else {
htmlSetMetaEncoding(cur, (const xmlChar *) "UTF-8"); htmlSetMetaEncoding(cur, (const xmlChar *) "UTF-8");
}
/* /*
* Fallback to HTML or ASCII when the encoding is unspecified * Fallback to HTML or ASCII when the encoding is unspecified
@ -1245,6 +1210,7 @@ htmlSaveFileFormat(const char *filename, xmlDocPtr cur,
handler = xmlFindCharEncodingHandler("HTML"); handler = xmlFindCharEncodingHandler("HTML");
if (handler == NULL) if (handler == NULL)
handler = xmlFindCharEncodingHandler("ascii"); handler = xmlFindCharEncodingHandler("ascii");
}
/* /*
* save the content to a temp buffer. * save the content to a temp buffer.

13
sdk/lib/3rdparty/libxml2/SAX2.c vendored
View file

@ -1665,7 +1665,11 @@ xmlSAX2StartElement(void *ctx, const xmlChar *fullname, const xmlChar **atts)
#ifdef DEBUG_SAX_TREE #ifdef DEBUG_SAX_TREE
xmlGenericError(xmlGenericErrorContext, "pushing(%s)\n", name); xmlGenericError(xmlGenericErrorContext, "pushing(%s)\n", name);
#endif #endif
nodePush(ctxt, ret); if (nodePush(ctxt, ret) < 0) {
xmlUnlinkNode(ret);
xmlFreeNode(ret);
return;
}
/* /*
* Link the child element * Link the child element
@ -2257,6 +2261,7 @@ xmlSAX2StartElementNs(void *ctx,
ctxt->freeElems = ret->next; ctxt->freeElems = ret->next;
ctxt->freeElemsNr--; ctxt->freeElemsNr--;
memset(ret, 0, sizeof(xmlNode)); memset(ret, 0, sizeof(xmlNode));
ret->doc = ctxt->myDoc;
ret->type = XML_ELEMENT_NODE; ret->type = XML_ELEMENT_NODE;
if (ctxt->dictNames) if (ctxt->dictNames)
@ -2336,7 +2341,11 @@ xmlSAX2StartElementNs(void *ctx,
/* /*
* We are parsing a new node. * We are parsing a new node.
*/ */
nodePush(ctxt, ret); if (nodePush(ctxt, ret) < 0) {
xmlUnlinkNode(ret);
xmlFreeNode(ret);
return;
}
/* /*
* Link the child element * Link the child element

9
sdk/lib/3rdparty/libxml2/c14n.c vendored
View file

@ -1797,15 +1797,6 @@ xmlC14NNewCtx(xmlDocPtr doc,
return (NULL); return (NULL);
} }
/*
* Validate the XML document encoding value, if provided.
*/
if (doc->charset != XML_CHAR_ENCODING_UTF8) {
xmlC14NErr(ctx, (xmlNodePtr) doc, XML_C14N_REQUIRES_UTF8,
"xmlC14NNewCtx: source document not in UTF8\n");
return (NULL);
}
/* /*
* Allocate a new xmlC14NCtxPtr and fill the fields. * Allocate a new xmlC14NCtxPtr and fill the fields.
*/ */

2
sdk/lib/3rdparty/libxml2/config.h vendored
View file

@ -267,7 +267,7 @@
/* #undef VA_LIST_IS_ARRAY */ /* #undef VA_LIST_IS_ARRAY */
/* Version number of package */ /* Version number of package */
#define VERSION "2.9.8" #define VERSION "2.9.9"
/* Determine what socket length (socklen_t) data type is */ /* Determine what socket length (socklen_t) data type is */
#define XML_SOCKLEN_T int #define XML_SOCKLEN_T int

2
sdk/lib/3rdparty/libxml2/encoding.c vendored
View file

@ -2460,8 +2460,6 @@ retry:
ret = -3; ret = -3;
} }
if (ret >= 0) output += ret;
/* /*
* Attempt to handle error cases * Attempt to handle error cases
*/ */

5
sdk/lib/3rdparty/libxml2/parser.c vendored
View file

@ -12462,7 +12462,12 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
ctxt->input->free((xmlChar *) ctxt->input->base); ctxt->input->free((xmlChar *) ctxt->input->base);
ctxt->input->free = NULL; ctxt->input->free = NULL;
} }
if (ctxt->input->buf != NULL) {
xmlFreeParserInputBuffer(ctxt->input->buf);
ctxt->input->buf = NULL;
}
ctxt->input->cur = BAD_CAST""; ctxt->input->cur = BAD_CAST"";
ctxt->input->length = 0;
ctxt->input->base = ctxt->input->cur; ctxt->input->base = ctxt->input->cur;
ctxt->input->end = ctxt->input->cur; ctxt->input->end = ctxt->input->cur;
} }

12
sdk/lib/3rdparty/libxml2/parserInternals.c vendored
View file

@ -1214,7 +1214,7 @@ xmlSwitchInputEncodingInt(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
/* /*
* convert as much as possible of the buffer * convert as much as possible of the buffer
*/ */
nbchars = xmlCharEncInput(input->buf, 0); nbchars = xmlCharEncInput(input->buf, 1);
} else { } else {
/* /*
* convert just enough to get * convert just enough to get
@ -1240,8 +1240,18 @@ xmlSwitchInputEncodingInt(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
* size to be able to convert the buffer. * size to be able to convert the buffer.
*/ */
xmlErrInternal(ctxt, "switching encoding : no input\n", NULL); xmlErrInternal(ctxt, "switching encoding : no input\n", NULL);
/*
* Callers assume that the input buffer takes ownership of the
* encoding handler. xmlCharEncCloseFunc frees unregistered
* handlers and avoids a memory leak.
*/
xmlCharEncCloseFunc(handler);
return (-1); return (-1);
} }
/*
* We should actually raise an error here, see issue #34.
*/
xmlCharEncCloseFunc(handler);
return (0); return (0);
} }

36
sdk/lib/3rdparty/libxml2/relaxng.c vendored
View file

@ -1573,6 +1573,9 @@ xmlRelaxNGRemoveRedefine(xmlRelaxNGParserCtxtPtr ctxt,
#endif #endif
} }
} }
if (xmlRelaxNGRemoveRedefine(ctxt, URL, tmp->children, name) == 1) {
found = 1;
}
} }
tmp = tmp2; tmp = tmp2;
} }
@ -1739,7 +1742,18 @@ xmlRelaxNGLoadInclude(xmlRelaxNGParserCtxtPtr ctxt, const xmlChar * URL,
xmlFree(name); xmlFree(name);
} }
} }
if (IS_RELAXNG(cur, "div") && cur->children != NULL) {
cur = cur->children;
} else {
if (cur->next != NULL) {
cur = cur->next; cur = cur->next;
} else {
while (cur->parent != node && cur->parent->next == NULL) {
cur = cur->parent;
}
cur = cur->parent != node ? cur->parent->next : NULL;
}
}
} }
@ -3979,7 +3993,7 @@ xmlRelaxNGGenerateAttributes(xmlRelaxNGParserCtxtPtr ctxt,
* xmlRelaxNGGetElements: * xmlRelaxNGGetElements:
* @ctxt: a Relax-NG parser context * @ctxt: a Relax-NG parser context
* @def: the definition definition * @def: the definition definition
* @eora: gather elements (0) or attributes (1) * @eora: gather elements (0), attributes (1) or elements and text (2)
* *
* Compute the list of top elements a definition can generate * Compute the list of top elements a definition can generate
* *
@ -4005,7 +4019,12 @@ xmlRelaxNGGetElements(xmlRelaxNGParserCtxtPtr ctxt,
while (cur != NULL) { while (cur != NULL) {
if (((eora == 0) && ((cur->type == XML_RELAXNG_ELEMENT) || if (((eora == 0) && ((cur->type == XML_RELAXNG_ELEMENT) ||
(cur->type == XML_RELAXNG_TEXT))) || (cur->type == XML_RELAXNG_TEXT))) ||
((eora == 1) && (cur->type == XML_RELAXNG_ATTRIBUTE))) { ((eora == 1) && (cur->type == XML_RELAXNG_ATTRIBUTE)) ||
((eora == 2) && ((cur->type == XML_RELAXNG_DATATYPE) ||
(cur->type == XML_RELAXNG_ELEMENT) ||
(cur->type == XML_RELAXNG_LIST) ||
(cur->type == XML_RELAXNG_TEXT) ||
(cur->type == XML_RELAXNG_VALUE)))) {
if (ret == NULL) { if (ret == NULL) {
max = 10; max = 10;
ret = (xmlRelaxNGDefinePtr *) ret = (xmlRelaxNGDefinePtr *)
@ -4360,7 +4379,7 @@ xmlRelaxNGComputeInterleaves(void *payload, void *data,
if (cur->type == XML_RELAXNG_TEXT) if (cur->type == XML_RELAXNG_TEXT)
is_mixed++; is_mixed++;
groups[nbgroups]->rule = cur; groups[nbgroups]->rule = cur;
groups[nbgroups]->defs = xmlRelaxNGGetElements(ctxt, cur, 0); groups[nbgroups]->defs = xmlRelaxNGGetElements(ctxt, cur, 2);
groups[nbgroups]->attrs = xmlRelaxNGGetElements(ctxt, cur, 1); groups[nbgroups]->attrs = xmlRelaxNGGetElements(ctxt, cur, 1);
nbgroups++; nbgroups++;
cur = cur->next; cur = cur->next;
@ -5347,11 +5366,15 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
xmlNodePtr child; xmlNodePtr child;
xmlRelaxNGDefinePtr last = NULL; xmlRelaxNGDefinePtr last = NULL;
if (def->type == XML_RELAXNG_CHOICE) {
ret = def;
} else {
ret = xmlRelaxNGNewDefine(ctxt, node); ret = xmlRelaxNGNewDefine(ctxt, node);
if (ret == NULL) if (ret == NULL)
return (NULL); return (NULL);
ret->parent = def; ret->parent = def;
ret->type = XML_RELAXNG_CHOICE; ret->type = XML_RELAXNG_CHOICE;
}
if (node->children == NULL) { if (node->children == NULL) {
xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_EMPTY, xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_EMPTY,
@ -5363,7 +5386,7 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
tmp = xmlRelaxNGParseNameClass(ctxt, child, ret); tmp = xmlRelaxNGParseNameClass(ctxt, child, ret);
if (tmp != NULL) { if (tmp != NULL) {
if (last == NULL) { if (last == NULL) {
last = ret->nameClass = tmp; last = tmp;
} else { } else {
last->next = tmp; last->next = tmp;
last = tmp; last = tmp;
@ -9262,7 +9285,10 @@ xmlRelaxNGNodeMatchesList(xmlNodePtr node, xmlRelaxNGDefinePtr * list)
return (1); return (1);
} else if (((node->type == XML_TEXT_NODE) || } else if (((node->type == XML_TEXT_NODE) ||
(node->type == XML_CDATA_SECTION_NODE)) && (node->type == XML_CDATA_SECTION_NODE)) &&
(cur->type == XML_RELAXNG_TEXT)) { ((cur->type == XML_RELAXNG_DATATYPE) ||
(cur->type == XML_RELAXNG_LIST) ||
(cur->type == XML_RELAXNG_TEXT) ||
(cur->type == XML_RELAXNG_VALUE))) {
return (1); return (1);
} }
cur = list[i++]; cur = list[i++];

39
sdk/lib/3rdparty/libxml2/uri.c vendored
View file

@ -2236,25 +2236,8 @@ xmlBuildRelativeURI (const xmlChar * URI, const xmlChar * base)
* First we take care of the special case where either of the * First we take care of the special case where either of the
* two path components may be missing (bug 316224) * two path components may be missing (bug 316224)
*/ */
if (bas->path == NULL) {
if (ref->path != NULL) {
uptr = (xmlChar *) ref->path;
if (*uptr == '/')
uptr++;
/* exception characters from xmlSaveUri */
val = xmlURIEscapeStr(uptr, BAD_CAST "/;&=+$,");
}
goto done;
}
bptr = (xmlChar *)bas->path; bptr = (xmlChar *)bas->path;
if (ref->path == NULL) { {
for (ix = 0; bptr[ix] != 0; ix++) {
if (bptr[ix] == '/')
nbslash++;
}
uptr = NULL;
len = 1; /* this is for a string terminator only */
} else {
xmlChar *rptr = (xmlChar *) ref->path; xmlChar *rptr = (xmlChar *) ref->path;
int pos = 0; int pos = 0;
@ -2280,30 +2263,28 @@ xmlBuildRelativeURI (const xmlChar * URI, const xmlChar * base)
* beginning of the "unique" suffix of URI * beginning of the "unique" suffix of URI
*/ */
ix = pos; ix = pos;
if ((rptr[ix] == '/') && (ix > 0))
ix--;
else if ((rptr[ix] == 0) && (ix > 1) && (rptr[ix - 1] == '/'))
ix -= 2;
for (; ix > 0; ix--) { for (; ix > 0; ix--) {
if (rptr[ix] == '/') if (rptr[ix - 1] == '/')
break; break;
} }
if (ix == 0) {
uptr = (xmlChar *)rptr;
} else {
ix++;
uptr = (xmlChar *)&rptr[ix]; uptr = (xmlChar *)&rptr[ix];
}
/* /*
* In base, count the number of '/' from the differing point * In base, count the number of '/' from the differing point
*/ */
if (bptr[pos] != rptr[pos]) {/* check for trivial URI == base */
for (; bptr[ix] != 0; ix++) { for (; bptr[ix] != 0; ix++) {
if (bptr[ix] == '/') if (bptr[ix] == '/')
nbslash++; nbslash++;
} }
/*
* e.g: URI="foo/" base="foo/bar" -> "./"
*/
if (nbslash == 0 && !uptr[0]) {
val = xmlStrdup(BAD_CAST "./");
goto done;
} }
len = xmlStrlen (uptr) + 1; len = xmlStrlen (uptr) + 1;
} }

4
sdk/lib/3rdparty/libxml2/xmlIO.c vendored
View file

@ -3161,7 +3161,7 @@ xmlParserInputBufferPush(xmlParserInputBufferPtr in,
* convert as much as possible to the parser reading buffer. * convert as much as possible to the parser reading buffer.
*/ */
use = xmlBufUse(in->raw); use = xmlBufUse(in->raw);
nbchars = xmlCharEncInput(in, 0); nbchars = xmlCharEncInput(in, 1);
if (nbchars < 0) { if (nbchars < 0) {
xmlIOErr(XML_IO_ENCODER, NULL); xmlIOErr(XML_IO_ENCODER, NULL);
in->error = XML_IO_ENCODER; in->error = XML_IO_ENCODER;
@ -3277,7 +3277,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
* convert as much as possible to the parser reading buffer. * convert as much as possible to the parser reading buffer.
*/ */
use = xmlBufUse(in->raw); use = xmlBufUse(in->raw);
nbchars = xmlCharEncInput(in, 0); nbchars = xmlCharEncInput(in, 1);
if (nbchars < 0) { if (nbchars < 0) {
xmlIOErr(XML_IO_ENCODER, NULL); xmlIOErr(XML_IO_ENCODER, NULL);
in->error = XML_IO_ENCODER; in->error = XML_IO_ENCODER;

25
sdk/lib/3rdparty/libxml2/xmllint.c vendored
View file

@ -2071,51 +2071,52 @@ static void doXPathDump(xmlXPathObjectPtr cur) {
int i; int i;
xmlNodePtr node; xmlNodePtr node;
#ifdef LIBXML_OUTPUT_ENABLED #ifdef LIBXML_OUTPUT_ENABLED
xmlSaveCtxtPtr ctxt; xmlOutputBufferPtr buf;
if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr <= 0)) { if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr <= 0)) {
fprintf(stderr, "XPath set is empty\n"); fprintf(stderr, "XPath set is empty\n");
progresult = XMLLINT_ERR_XPATH; progresult = XMLLINT_ERR_XPATH;
break; break;
} }
ctxt = xmlSaveToFd(1, NULL, 0); buf = xmlOutputBufferCreateFile(stdout, NULL);
if (ctxt == NULL) { if (buf == NULL) {
fprintf(stderr, "Out of memory for XPath\n"); fprintf(stderr, "Out of memory for XPath\n");
progresult = XMLLINT_ERR_MEM; progresult = XMLLINT_ERR_MEM;
return; return;
} }
for (i = 0;i < cur->nodesetval->nodeNr;i++) { for (i = 0;i < cur->nodesetval->nodeNr;i++) {
node = cur->nodesetval->nodeTab[i]; node = cur->nodesetval->nodeTab[i];
xmlSaveTree(ctxt, node); xmlNodeDumpOutput(buf, node->doc, node, 0, 0, NULL);
xmlOutputBufferWrite(buf, 1, "\n");
} }
xmlSaveClose(ctxt); xmlOutputBufferClose(buf);
#else #else
printf("xpath returned %d nodes\n", cur->nodesetval->nodeNr); printf("xpath returned %d nodes\n", cur->nodesetval->nodeNr);
#endif #endif
break; break;
} }
case XPATH_BOOLEAN: case XPATH_BOOLEAN:
if (cur->boolval) printf("true"); if (cur->boolval) printf("true\n");
else printf("false"); else printf("false\n");
break; break;
case XPATH_NUMBER: case XPATH_NUMBER:
switch (xmlXPathIsInf(cur->floatval)) { switch (xmlXPathIsInf(cur->floatval)) {
case 1: case 1:
printf("Infinity"); printf("Infinity\n");
break; break;
case -1: case -1:
printf("-Infinity"); printf("-Infinity\n");
break; break;
default: default:
if (xmlXPathIsNaN(cur->floatval)) { if (xmlXPathIsNaN(cur->floatval)) {
printf("NaN"); printf("NaN\n");
} else { } else {
printf("%0g", cur->floatval); printf("%0g\n", cur->floatval);
} }
} }
break; break;
case XPATH_STRING: case XPATH_STRING:
printf("%s", (const char *) cur->stringval); printf("%s\n", (const char *) cur->stringval);
break; break;
case XPATH_UNDEFINED: case XPATH_UNDEFINED:
fprintf(stderr, "XPath Object is uninitialized\n"); fprintf(stderr, "XPath Object is uninitialized\n");

11
sdk/lib/3rdparty/libxml2/xmlreader.c vendored
View file

@ -1711,10 +1711,11 @@ xmlTextReaderReadInnerXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED)
if (xmlTextReaderExpand(reader) == NULL) { if (xmlTextReaderExpand(reader) == NULL) {
return NULL; return NULL;
} }
doc = reader->doc; doc = reader->node->doc;
buff = xmlBufferCreate(); buff = xmlBufferCreate();
for (cur_node = reader->node->children; cur_node != NULL; for (cur_node = reader->node->children; cur_node != NULL;
cur_node = cur_node->next) { cur_node = cur_node->next) {
/* XXX: Why is the node copied? */
node = xmlDocCopyNode(cur_node, doc, 1); node = xmlDocCopyNode(cur_node, doc, 1);
buff2 = xmlBufferCreate(); buff2 = xmlBufferCreate();
if (xmlNodeDump(buff2, doc, node, 0, 0) == -1) { if (xmlNodeDump(buff2, doc, node, 0, 0) == -1) {
@ -1755,10 +1756,11 @@ xmlTextReaderReadOuterXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED)
xmlDocPtr doc; xmlDocPtr doc;
node = reader->node; node = reader->node;
doc = reader->doc; doc = node->doc;
if (xmlTextReaderExpand(reader) == NULL) { if (xmlTextReaderExpand(reader) == NULL) {
return NULL; return NULL;
} }
/* XXX: Why is the node copied? */
if (node->type == XML_DTD_NODE) { if (node->type == XML_DTD_NODE) {
node = (xmlNodePtr) xmlCopyDtd((xmlDtdPtr) node); node = (xmlNodePtr) xmlCopyDtd((xmlDtdPtr) node);
} else { } else {
@ -1917,13 +1919,10 @@ xmlTextReaderNextTree(xmlTextReaderPtr reader)
/* if reader->node->next is NULL mean no subtree for current node, /* if reader->node->next is NULL mean no subtree for current node,
so need to move to sibling of parent node if present */ so need to move to sibling of parent node if present */
if ((reader->node->type == XML_ELEMENT_NODE) ||
(reader->node->type == XML_ATTRIBUTE_NODE)) {
reader->state = XML_TEXTREADER_BACKTRACK; reader->state = XML_TEXTREADER_BACKTRACK;
/* This will move to parent if present */ /* This will move to parent if present */
xmlTextReaderRead(reader); xmlTextReaderRead(reader);
} }
}
if (reader->node->next != 0) { if (reader->node->next != 0) {
reader->node = reader->node->next; reader->node = reader->node->next;
@ -3006,7 +3005,7 @@ xmlTextReaderAttributeCount(xmlTextReaderPtr reader) {
* Reference: * Reference:
* http://www.gnu.org/software/dotgnu/pnetlib-doc/System/Xml/XmlNodeType.html * http://www.gnu.org/software/dotgnu/pnetlib-doc/System/Xml/XmlNodeType.html
* *
* Returns the xmlNodeType of the current node or -1 in case of error * Returns the xmlReaderTypes of the current node or -1 in case of error
*/ */
int int
xmlTextReaderNodeType(xmlTextReaderPtr reader) { xmlTextReaderNodeType(xmlTextReaderPtr reader) {

3
sdk/lib/3rdparty/libxml2/xmlsave.c vendored
View file

@ -1123,9 +1123,6 @@ xmlDocContentDumpOutput(xmlSaveCtxtPtr ctxt, xmlDocPtr cur) {
cur->encoding = BAD_CAST ctxt->encoding; cur->encoding = BAD_CAST ctxt->encoding;
} else if (cur->encoding != NULL) { } else if (cur->encoding != NULL) {
encoding = cur->encoding; encoding = cur->encoding;
} else if (cur->charset != XML_CHAR_ENCODING_UTF8) {
encoding = (const xmlChar *)
xmlGetCharEncodingName((xmlCharEncoding) cur->charset);
} }
if (((cur->type == XML_HTML_DOCUMENT_NODE) && if (((cur->type == XML_HTML_DOCUMENT_NODE) &&

11
sdk/lib/3rdparty/libxml2/xmlschemas.c vendored
View file

@ -27653,6 +27653,17 @@ xmlSchemaClearValidCtxt(xmlSchemaValidCtxtPtr vctxt)
vctxt->nbIdcNodes = 0; vctxt->nbIdcNodes = 0;
vctxt->sizeIdcNodes = 0; vctxt->sizeIdcNodes = 0;
} }
if (vctxt->idcKeys != NULL) {
int i;
for (i = 0; i < vctxt->nbIdcKeys; i++)
xmlSchemaIDCFreeKey(vctxt->idcKeys[i]);
xmlFree(vctxt->idcKeys);
vctxt->idcKeys = NULL;
vctxt->nbIdcKeys = 0;
vctxt->sizeIdcKeys = 0;
}
/* /*
* Note that we won't delete the XPath state pool here. * Note that we won't delete the XPath state pool here.
*/ */

388
sdk/lib/3rdparty/libxml2/xpath.c vendored
View file

@ -2,7 +2,7 @@
* xpath.c: XML Path Language implementation * xpath.c: XML Path Language implementation
* XPath is a language for addressing parts of an XML document, * XPath is a language for addressing parts of an XML document,
* designed to be used by both XSLT and XPointer * designed to be used by both XSLT and XPointer
*f *
* Reference: W3C Recommendation 16 November 1999 * Reference: W3C Recommendation 16 November 1999
* http://www.w3.org/TR/1999/REC-xpath-19991116 * http://www.w3.org/TR/1999/REC-xpath-19991116
* Public reference: * Public reference:
@ -477,27 +477,28 @@ int wrap_cmp( xmlNodePtr x, xmlNodePtr y );
* * * *
************************************************************************/ ************************************************************************/
#ifndef NAN
#define NAN (0.0 / 0.0)
#endif
#ifndef INFINITY #ifndef INFINITY
#define INFINITY HUGE_VAL #define INFINITY (DBL_MAX * DBL_MAX)
#endif #endif
double xmlXPathNAN = NAN; #ifndef NAN
double xmlXPathPINF = INFINITY; #define NAN (INFINITY / INFINITY)
double xmlXPathNINF = -INFINITY; #endif
double xmlXPathNAN;
double xmlXPathPINF;
double xmlXPathNINF;
/** /**
* xmlXPathInit: * xmlXPathInit:
* *
* Initialize the XPath environment * Initialize the XPath environment
*
* Does nothing but must be kept as public function.
*/ */
void void
xmlXPathInit(void) { xmlXPathInit(void) {
xmlXPathNAN = NAN;
xmlXPathPINF = INFINITY;
xmlXPathNINF = -INFINITY;
} }
/** /**
@ -526,9 +527,9 @@ xmlXPathIsInf(double val) {
#ifdef isinf #ifdef isinf
return isinf(val) ? (val > 0 ? 1 : -1) : 0; return isinf(val) ? (val > 0 ? 1 : -1) : 0;
#else #else
if (val >= HUGE_VAL) if (val >= INFINITY)
return 1; return 1;
if (val <= -HUGE_VAL) if (val <= -INFINITY)
return -1; return -1;
return 0; return 0;
#endif #endif
@ -867,15 +868,14 @@ typedef enum {
XPATH_OP_UNION, XPATH_OP_UNION,
XPATH_OP_ROOT, XPATH_OP_ROOT,
XPATH_OP_NODE, XPATH_OP_NODE,
XPATH_OP_RESET, /* 10 */
XPATH_OP_COLLECT, XPATH_OP_COLLECT,
XPATH_OP_VALUE, /* 12 */ XPATH_OP_VALUE, /* 11 */
XPATH_OP_VARIABLE, XPATH_OP_VARIABLE,
XPATH_OP_FUNCTION, XPATH_OP_FUNCTION,
XPATH_OP_ARG, XPATH_OP_ARG,
XPATH_OP_PREDICATE, XPATH_OP_PREDICATE,
XPATH_OP_FILTER, /* 17 */ XPATH_OP_FILTER, /* 16 */
XPATH_OP_SORT /* 18 */ XPATH_OP_SORT /* 17 */
#ifdef LIBXML_XPTR_ENABLED #ifdef LIBXML_XPTR_ENABLED
,XPATH_OP_RANGETO ,XPATH_OP_RANGETO
#endif #endif
@ -1525,8 +1525,6 @@ xmlXPathDebugDumpStepOp(FILE *output, xmlXPathCompExprPtr comp,
fprintf(output, "ROOT"); break; fprintf(output, "ROOT"); break;
case XPATH_OP_NODE: case XPATH_OP_NODE:
fprintf(output, "NODE"); break; fprintf(output, "NODE"); break;
case XPATH_OP_RESET:
fprintf(output, "RESET"); break;
case XPATH_OP_SORT: case XPATH_OP_SORT:
fprintf(output, "SORT"); break; fprintf(output, "SORT"); break;
case XPATH_OP_COLLECT: { case XPATH_OP_COLLECT: {
@ -8479,9 +8477,8 @@ void
xmlXPathRoot(xmlXPathParserContextPtr ctxt) { xmlXPathRoot(xmlXPathParserContextPtr ctxt) {
if ((ctxt == NULL) || (ctxt->context == NULL)) if ((ctxt == NULL) || (ctxt->context == NULL))
return; return;
ctxt->context->node = (xmlNodePtr) ctxt->context->doc;
valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context,
ctxt->context->node)); (xmlNodePtr) ctxt->context->doc));
} }
/************************************************************************ /************************************************************************
@ -10734,7 +10731,6 @@ xmlXPathCompPathExpr(xmlXPathParserContextPtr ctxt) {
PUSH_LONG_EXPR(XPATH_OP_COLLECT, AXIS_DESCENDANT_OR_SELF, PUSH_LONG_EXPR(XPATH_OP_COLLECT, AXIS_DESCENDANT_OR_SELF,
NODE_TEST_TYPE, NODE_TYPE_NODE, NULL, NULL); NODE_TEST_TYPE, NODE_TYPE_NODE, NULL, NULL);
PUSH_UNARY_EXPR(XPATH_OP_RESET, ctxt->comp->last, 1, 0);
xmlXPathCompRelativeLocationPath(ctxt); xmlXPathCompRelativeLocationPath(ctxt);
} else if (CUR == '/') { } else if (CUR == '/') {
@ -11665,6 +11661,7 @@ xmlXPathCompOpEvalPredicate(xmlXPathParserContextPtr ctxt,
xmlXPathContextPtr xpctxt = ctxt->context; xmlXPathContextPtr xpctxt = ctxt->context;
xmlNodePtr contextNode, oldContextNode; xmlNodePtr contextNode, oldContextNode;
xmlDocPtr oldContextDoc; xmlDocPtr oldContextDoc;
int oldcs, oldpp;
int i, res, contextPos = 0, newContextSize; int i, res, contextPos = 0, newContextSize;
xmlXPathStepOpPtr exprOp; xmlXPathStepOpPtr exprOp;
xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
@ -11701,6 +11698,8 @@ xmlXPathCompOpEvalPredicate(xmlXPathParserContextPtr ctxt,
*/ */
oldContextNode = xpctxt->node; oldContextNode = xpctxt->node;
oldContextDoc = xpctxt->doc; oldContextDoc = xpctxt->doc;
oldcs = xpctxt->contextSize;
oldpp = xpctxt->proximityPosition;
/* /*
* Get the expression of this predicate. * Get the expression of this predicate.
*/ */
@ -11787,8 +11786,8 @@ evaluation_exit:
*/ */
xpctxt->node = oldContextNode; xpctxt->node = oldContextNode;
xpctxt->doc = oldContextDoc; xpctxt->doc = oldContextDoc;
xpctxt->contextSize = -1; xpctxt->contextSize = oldcs;
xpctxt->proximityPosition = -1; xpctxt->proximityPosition = oldpp;
return(newContextSize); return(newContextSize);
} }
return(contextSize); return(contextSize);
@ -11831,6 +11830,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
return (contextSize); return (contextSize);
} else { } else {
xmlDocPtr oldContextDoc; xmlDocPtr oldContextDoc;
int oldcs, oldpp;
int i, pos = 0, newContextSize = 0, contextPos = 0, res; int i, pos = 0, newContextSize = 0, contextPos = 0, res;
xmlXPathStepOpPtr exprOp; xmlXPathStepOpPtr exprOp;
xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
@ -11851,6 +11851,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
*/ */
oldContextNode = xpctxt->node; oldContextNode = xpctxt->node;
oldContextDoc = xpctxt->doc; oldContextDoc = xpctxt->doc;
oldcs = xpctxt->contextSize;
oldpp = xpctxt->proximityPosition;
/* /*
* Get the expression of this predicate. * Get the expression of this predicate.
*/ */
@ -11987,8 +11989,8 @@ evaluation_exit:
*/ */
xpctxt->node = oldContextNode; xpctxt->node = oldContextNode;
xpctxt->doc = oldContextDoc; xpctxt->doc = oldContextDoc;
xpctxt->contextSize = -1; xpctxt->contextSize = oldcs;
xpctxt->proximityPosition = -1; xpctxt->proximityPosition = oldpp;
return(newContextSize); return(newContextSize);
} }
return(contextSize); return(contextSize);
@ -12778,15 +12780,6 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt,
valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context,
ctxt->context->node)); ctxt->context->node));
return (total); return (total);
case XPATH_OP_RESET:
if (op->ch1 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0;
if (op->ch2 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0;
ctxt->context->node = NULL;
return (total);
case XPATH_OP_COLLECT:{ case XPATH_OP_COLLECT:{
if (op->ch1 == -1) if (op->ch1 == -1)
return (total); return (total);
@ -12842,10 +12835,6 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
int total = 0, cur; int total = 0, cur;
xmlXPathCompExprPtr comp; xmlXPathCompExprPtr comp;
xmlXPathObjectPtr arg1, arg2; xmlXPathObjectPtr arg1, arg2;
xmlNodePtr bak;
xmlDocPtr bakd;
int pp;
int cs;
CHECK_ERROR0; CHECK_ERROR0;
comp = ctxt->comp; comp = ctxt->comp;
@ -12853,10 +12842,6 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
case XPATH_OP_END: case XPATH_OP_END:
return (0); return (0);
case XPATH_OP_UNION: case XPATH_OP_UNION:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total = total =
xmlXPathCompOpEvalLast(ctxt, &comp->steps[op->ch1], last); xmlXPathCompOpEvalLast(ctxt, &comp->steps[op->ch1], last);
CHECK_ERROR0; CHECK_ERROR0;
@ -12874,10 +12859,6 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
nodesetval->nodeNr - nodesetval->nodeNr -
1]; 1];
} }
ctxt->context->doc = bakd;
ctxt->context->node = bak;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
cur = cur =
xmlXPathCompOpEvalLast(ctxt, &comp->steps[op->ch2], last); xmlXPathCompOpEvalLast(ctxt, &comp->steps[op->ch2], last);
CHECK_ERROR0; CHECK_ERROR0;
@ -12917,15 +12898,6 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context,
ctxt->context->node)); ctxt->context->node));
return (total); return (total);
case XPATH_OP_RESET:
if (op->ch1 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0;
if (op->ch2 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0;
ctxt->context->node = NULL;
return (total);
case XPATH_OP_COLLECT:{ case XPATH_OP_COLLECT:{
if (op->ch1 == -1) if (op->ch1 == -1)
return (0); return (0);
@ -12970,6 +12942,7 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
xmlNodeSetPtr oldset; xmlNodeSetPtr oldset;
xmlNodePtr oldnode; xmlNodePtr oldnode;
xmlDocPtr oldDoc; xmlDocPtr oldDoc;
int oldcs, oldpp;
int i; int i;
CHECK_ERROR0; CHECK_ERROR0;
@ -13021,7 +12994,6 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
return (total); return (total);
#ifdef LIBXML_XPTR_ENABLED #ifdef LIBXML_XPTR_ENABLED
oldnode = ctxt->context->node;
/* /*
* Hum are we filtering the result of an XPointer expression * Hum are we filtering the result of an XPointer expression
*/ */
@ -13036,23 +13008,17 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
* up a new locset. * up a new locset.
*/ */
CHECK_TYPE0(XPATH_LOCATIONSET); CHECK_TYPE0(XPATH_LOCATIONSET);
if ((ctxt->value->user == NULL) ||
(((xmlLocationSetPtr) ctxt->value->user)->locNr == 0))
return (total);
obj = valuePop(ctxt); obj = valuePop(ctxt);
oldlocset = obj->user; oldlocset = obj->user;
ctxt->context->node = NULL; oldnode = ctxt->context->node;
oldcs = ctxt->context->contextSize;
oldpp = ctxt->context->proximityPosition;
if ((oldlocset == NULL) || (oldlocset->locNr == 0)) {
ctxt->context->contextSize = 0;
ctxt->context->proximityPosition = 0;
if (op->ch2 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
res = valuePop(ctxt);
if (res != NULL) {
xmlXPathReleaseObject(ctxt->context, res);
}
valuePush(ctxt, obj);
CHECK_ERROR0;
return (total);
}
newlocset = xmlXPtrLocationSetCreate(NULL); newlocset = xmlXPtrLocationSetCreate(NULL);
for (i = 0; i < oldlocset->locNr; i++) { for (i = 0; i < oldlocset->locNr; i++) {
@ -13076,8 +13042,8 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
if (op->ch2 != -1) if (op->ch2 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeObject(obj); xmlXPtrFreeLocationSet(newlocset);
return(0); goto xptr_error;
} }
/* /*
* The result of the evaluation need to be tested to * The result of the evaluation need to be tested to
@ -13105,7 +13071,6 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
/* OLD: xmlXPathFreeObject(res); */ /* OLD: xmlXPathFreeObject(res); */
} else } else
tmp = NULL; tmp = NULL;
ctxt->context->node = NULL;
/* /*
* Only put the first node in the result, then leave. * Only put the first node in the result, then leave.
*/ */
@ -13120,12 +13085,12 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
/* /*
* The result is used as the new evaluation locset. * The result is used as the new evaluation locset.
*/ */
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = NULL;
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset)); valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset));
xptr_error:
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode; ctxt->context->node = oldnode;
ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
return (total); return (total);
} }
#endif /* LIBXML_XPTR_ENABLED */ #endif /* LIBXML_XPTR_ENABLED */
@ -13136,32 +13101,19 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
* up a new set. * up a new set.
*/ */
CHECK_TYPE0(XPATH_NODESET); CHECK_TYPE0(XPATH_NODESET);
obj = valuePop(ctxt);
oldset = obj->nodesetval;
oldnode = ctxt->context->node; if ((ctxt->value->nodesetval != NULL) &&
oldDoc = ctxt->context->doc; (ctxt->value->nodesetval->nodeNr != 0)) {
ctxt->context->node = NULL;
if ((oldset == NULL) || (oldset->nodeNr == 0)) {
ctxt->context->contextSize = 0;
ctxt->context->proximityPosition = 0;
/* QUESTION TODO: Why was this code commented out?
if (op->ch2 != -1)
total +=
xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]);
CHECK_ERROR0;
res = valuePop(ctxt);
if (res != NULL)
xmlXPathFreeObject(res);
*/
valuePush(ctxt, obj);
ctxt->context->node = oldnode;
CHECK_ERROR0;
} else {
xmlNodeSetPtr newset; xmlNodeSetPtr newset;
xmlXPathObjectPtr tmp = NULL; xmlXPathObjectPtr tmp = NULL;
obj = valuePop(ctxt);
oldset = obj->nodesetval;
oldnode = ctxt->context->node;
oldDoc = ctxt->context->doc;
oldcs = ctxt->context->contextSize;
oldpp = ctxt->context->proximityPosition;
/* /*
* Initialize the new set. * Initialize the new set.
* Also set the xpath document in case things like * Also set the xpath document in case things like
@ -13195,8 +13147,7 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeNodeSet(newset); xmlXPathFreeNodeSet(newset);
xmlXPathFreeObject(obj); goto error;
return(0);
} }
/* /*
* The result of the evaluation needs to be tested to * The result of the evaluation needs to be tested to
@ -13223,7 +13174,6 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
xmlXPathNodeSetClear(tmp->nodesetval, 1); xmlXPathNodeSetClear(tmp->nodesetval, 1);
} else } else
tmp = NULL; tmp = NULL;
ctxt->context->node = NULL;
/* /*
* Only put the first node in the result, then leave. * Only put the first node in the result, then leave.
*/ */
@ -13238,15 +13188,14 @@ xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt,
/* /*
* The result is used as the new evaluation set. * The result is used as the new evaluation set.
*/ */
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = NULL;
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
/* may want to move this past the '}' later */
ctxt->context->doc = oldDoc;
valuePush(ctxt, xmlXPathCacheWrapNodeSet(ctxt->context, newset)); valuePush(ctxt, xmlXPathCacheWrapNodeSet(ctxt->context, newset));
} error:
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode; ctxt->context->node = oldnode;
ctxt->context->doc = oldDoc;
ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
}
return(total); return(total);
} }
#endif /* XP_OPTIMIZED_FILTER_FIRST */ #endif /* XP_OPTIMIZED_FILTER_FIRST */
@ -13266,10 +13215,6 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
int equal, ret; int equal, ret;
xmlXPathCompExprPtr comp; xmlXPathCompExprPtr comp;
xmlXPathObjectPtr arg1, arg2; xmlXPathObjectPtr arg1, arg2;
xmlNodePtr bak;
xmlDocPtr bakd;
int pp;
int cs;
CHECK_ERROR0; CHECK_ERROR0;
comp = ctxt->comp; comp = ctxt->comp;
@ -13277,68 +13222,42 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
case XPATH_OP_END: case XPATH_OP_END:
return (0); return (0);
case XPATH_OP_AND: case XPATH_OP_AND:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
xmlXPathBooleanFunction(ctxt, 1); xmlXPathBooleanFunction(ctxt, 1);
if ((ctxt->value == NULL) || (ctxt->value->boolval == 0)) if ((ctxt->value == NULL) || (ctxt->value->boolval == 0))
return (total); return (total);
arg2 = valuePop(ctxt); arg2 = valuePop(ctxt);
ctxt->context->doc = bakd;
ctxt->context->node = bak;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error) { if (ctxt->error) {
xmlXPathFreeObject(arg2); xmlXPathFreeObject(arg2);
return(0); return(0);
} }
xmlXPathBooleanFunction(ctxt, 1); xmlXPathBooleanFunction(ctxt, 1);
arg1 = valuePop(ctxt); if (ctxt->value != NULL)
arg1->boolval &= arg2->boolval; ctxt->value->boolval &= arg2->boolval;
valuePush(ctxt, arg1);
xmlXPathReleaseObject(ctxt->context, arg2); xmlXPathReleaseObject(ctxt->context, arg2);
return (total); return (total);
case XPATH_OP_OR: case XPATH_OP_OR:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
xmlXPathBooleanFunction(ctxt, 1); xmlXPathBooleanFunction(ctxt, 1);
if ((ctxt->value == NULL) || (ctxt->value->boolval == 1)) if ((ctxt->value == NULL) || (ctxt->value->boolval == 1))
return (total); return (total);
arg2 = valuePop(ctxt); arg2 = valuePop(ctxt);
ctxt->context->doc = bakd;
ctxt->context->node = bak;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error) { if (ctxt->error) {
xmlXPathFreeObject(arg2); xmlXPathFreeObject(arg2);
return(0); return(0);
} }
xmlXPathBooleanFunction(ctxt, 1); xmlXPathBooleanFunction(ctxt, 1);
arg1 = valuePop(ctxt); if (ctxt->value != NULL)
arg1->boolval |= arg2->boolval; ctxt->value->boolval |= arg2->boolval;
valuePush(ctxt, arg1);
xmlXPathReleaseObject(ctxt->context, arg2); xmlXPathReleaseObject(ctxt->context, arg2);
return (total); return (total);
case XPATH_OP_EQUAL: case XPATH_OP_EQUAL:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->doc = bakd;
ctxt->context->node = bak;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
if (op->value) if (op->value)
@ -13348,33 +13267,17 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, equal)); valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, equal));
return (total); return (total);
case XPATH_OP_CMP: case XPATH_OP_CMP:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->doc = bakd;
ctxt->context->node = bak;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
ret = xmlXPathCompareValues(ctxt, op->value, op->value2); ret = xmlXPathCompareValues(ctxt, op->value, op->value2);
valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, ret)); valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, ret));
return (total); return (total);
case XPATH_OP_PLUS: case XPATH_OP_PLUS:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
if (op->ch2 != -1) { if (op->ch2 != -1) {
ctxt->context->doc = bakd;
ctxt->context->node = bak;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
} }
CHECK_ERROR0; CHECK_ERROR0;
@ -13390,16 +13293,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
} }
return (total); return (total);
case XPATH_OP_MULT: case XPATH_OP_MULT:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->doc = bakd;
ctxt->context->node = bak;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
if (op->value == 0) if (op->value == 0)
@ -13410,16 +13305,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathModValues(ctxt); xmlXPathModValues(ctxt);
return (total); return (total);
case XPATH_OP_UNION: case XPATH_OP_UNION:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->doc = bakd;
ctxt->context->node = bak;
ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
@ -13456,15 +13343,6 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context,
ctxt->context->node)); ctxt->context->node));
return (total); return (total);
case XPATH_OP_RESET:
if (op->ch1 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0;
if (op->ch2 != -1)
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0;
ctxt->context->node = NULL;
return (total);
case XPATH_OP_COLLECT:{ case XPATH_OP_COLLECT:{
if (op->ch1 == -1) if (op->ch1 == -1)
return (total); return (total);
@ -13583,24 +13461,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
return (total); return (total);
} }
case XPATH_OP_ARG: case XPATH_OP_ARG:
bakd = ctxt->context->doc;
bak = ctxt->context->node;
pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
if (op->ch1 != -1) { if (op->ch1 != -1) {
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
ctxt->context->contextSize = cs;
ctxt->context->proximityPosition = pp;
ctxt->context->node = bak;
ctxt->context->doc = bakd;
CHECK_ERROR0; CHECK_ERROR0;
} }
if (op->ch2 != -1) { if (op->ch2 != -1) {
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
ctxt->context->contextSize = cs;
ctxt->context->proximityPosition = pp;
ctxt->context->node = bak;
ctxt->context->doc = bakd;
CHECK_ERROR0; CHECK_ERROR0;
} }
return (total); return (total);
@ -13612,6 +13478,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlNodeSetPtr oldset; xmlNodeSetPtr oldset;
xmlNodePtr oldnode; xmlNodePtr oldnode;
xmlDocPtr oldDoc; xmlDocPtr oldDoc;
int oldcs, oldpp;
int i; int i;
/* /*
@ -13714,8 +13581,6 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
if (ctxt->value == NULL) if (ctxt->value == NULL)
return (total); return (total);
oldnode = ctxt->context->node;
#ifdef LIBXML_XPTR_ENABLED #ifdef LIBXML_XPTR_ENABLED
/* /*
* Hum are we filtering the result of an XPointer expression * Hum are we filtering the result of an XPointer expression
@ -13730,25 +13595,17 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
* up a new locset. * up a new locset.
*/ */
CHECK_TYPE0(XPATH_LOCATIONSET); CHECK_TYPE0(XPATH_LOCATIONSET);
if ((ctxt->value->user == NULL) ||
(((xmlLocationSetPtr) ctxt->value->user)->locNr == 0))
return (total);
obj = valuePop(ctxt); obj = valuePop(ctxt);
oldlocset = obj->user; oldlocset = obj->user;
ctxt->context->node = NULL; oldnode = ctxt->context->node;
oldcs = ctxt->context->contextSize;
oldpp = ctxt->context->proximityPosition;
if ((oldlocset == NULL) || (oldlocset->locNr == 0)) {
ctxt->context->contextSize = 0;
ctxt->context->proximityPosition = 0;
if (op->ch2 != -1)
total +=
xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]);
res = valuePop(ctxt);
if (res != NULL) {
xmlXPathReleaseObject(ctxt->context, res);
}
valuePush(ctxt, obj);
CHECK_ERROR0;
return (total);
}
newlocset = xmlXPtrLocationSetCreate(NULL); newlocset = xmlXPtrLocationSetCreate(NULL);
for (i = 0; i < oldlocset->locNr; i++) { for (i = 0; i < oldlocset->locNr; i++) {
@ -13768,8 +13625,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathCompOpEval(ctxt, xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]); &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeObject(obj); xmlXPtrFreeLocationSet(newlocset);
return(0); goto filter_xptr_error;
} }
/* /*
@ -13793,19 +13650,17 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
res = valuePop(ctxt); res = valuePop(ctxt);
xmlXPathReleaseObject(ctxt->context, res); xmlXPathReleaseObject(ctxt->context, res);
} }
ctxt->context->node = NULL;
} }
/* /*
* The result is used as the new evaluation locset. * The result is used as the new evaluation locset.
*/ */
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = NULL;
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset)); valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset));
filter_xptr_error:
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode; ctxt->context->node = oldnode;
ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
return (total); return (total);
} }
#endif /* LIBXML_XPTR_ENABLED */ #endif /* LIBXML_XPTR_ENABLED */
@ -13816,30 +13671,15 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
* up a new set. * up a new set.
*/ */
CHECK_TYPE0(XPATH_NODESET); CHECK_TYPE0(XPATH_NODESET);
if ((ctxt->value->nodesetval != NULL) &&
(ctxt->value->nodesetval->nodeNr != 0)) {
obj = valuePop(ctxt); obj = valuePop(ctxt);
oldset = obj->nodesetval; oldset = obj->nodesetval;
oldnode = ctxt->context->node; oldnode = ctxt->context->node;
oldDoc = ctxt->context->doc; oldDoc = ctxt->context->doc;
ctxt->context->node = NULL; oldcs = ctxt->context->contextSize;
oldpp = ctxt->context->proximityPosition;
if ((oldset == NULL) || (oldset->nodeNr == 0)) {
ctxt->context->contextSize = 0;
ctxt->context->proximityPosition = 0;
/*
if (op->ch2 != -1)
total +=
xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]);
CHECK_ERROR0;
res = valuePop(ctxt);
if (res != NULL)
xmlXPathFreeObject(res);
*/
valuePush(ctxt, obj);
ctxt->context->node = oldnode;
CHECK_ERROR0;
} else {
tmp = NULL; tmp = NULL;
/* /*
* Initialize the new set. * Initialize the new set.
@ -13905,8 +13745,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
&comp->steps[op->ch2]); &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeNodeSet(newset); xmlXPathFreeNodeSet(newset);
xmlXPathFreeObject(obj); goto filter_error;
return(0);
} }
/* /*
@ -13940,23 +13779,21 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
*/ */
} else } else
tmp = NULL; tmp = NULL;
ctxt->context->node = NULL;
} }
if (tmp != NULL) if (tmp != NULL)
xmlXPathReleaseObject(ctxt->context, tmp); xmlXPathReleaseObject(ctxt->context, tmp);
/* /*
* The result is used as the new evaluation set. * The result is used as the new evaluation set.
*/ */
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = NULL;
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
/* may want to move this past the '}' later */
ctxt->context->doc = oldDoc;
valuePush(ctxt, valuePush(ctxt,
xmlXPathCacheWrapNodeSet(ctxt->context, newset)); xmlXPathCacheWrapNodeSet(ctxt->context, newset));
} filter_error:
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode; ctxt->context->node = oldnode;
ctxt->context->doc = oldDoc;
ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
}
return (total); return (total);
} }
case XPATH_OP_SORT: case XPATH_OP_SORT:
@ -13979,6 +13816,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlLocationSetPtr newlocset = NULL; xmlLocationSetPtr newlocset = NULL;
xmlLocationSetPtr oldlocset; xmlLocationSetPtr oldlocset;
xmlNodeSetPtr oldset; xmlNodeSetPtr oldset;
xmlNodePtr oldnode = ctxt->context->node;
int oldcs = ctxt->context->contextSize;
int oldpp = ctxt->context->proximityPosition;
int i, j; int i, j;
if (op->ch1 != -1) { if (op->ch1 != -1) {
@ -13999,22 +13839,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
* up a new locset. * up a new locset.
*/ */
CHECK_TYPE0(XPATH_LOCATIONSET); CHECK_TYPE0(XPATH_LOCATIONSET);
if ((ctxt->value->user == NULL) ||
(((xmlLocationSetPtr) ctxt->value->user)->locNr == 0))
return (total);
obj = valuePop(ctxt); obj = valuePop(ctxt);
oldlocset = obj->user; oldlocset = obj->user;
if ((oldlocset == NULL) || (oldlocset->locNr == 0)) {
ctxt->context->node = NULL;
ctxt->context->contextSize = 0;
ctxt->context->proximityPosition = 0;
total += xmlXPathCompOpEval(ctxt,&comp->steps[op->ch2]);
res = valuePop(ctxt);
if (res != NULL) {
xmlXPathReleaseObject(ctxt->context, res);
}
valuePush(ctxt, obj);
CHECK_ERROR0;
return (total);
}
newlocset = xmlXPtrLocationSetCreate(NULL); newlocset = xmlXPtrLocationSetCreate(NULL);
for (i = 0; i < oldlocset->locNr; i++) { for (i = 0; i < oldlocset->locNr; i++) {
@ -14034,8 +13866,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathCompOpEval(ctxt, xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]); &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeObject(obj); xmlXPtrFreeLocationSet(newlocset);
return(0); goto rangeto_error;
} }
res = valuePop(ctxt); res = valuePop(ctxt);
@ -14070,14 +13902,11 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
res = valuePop(ctxt); res = valuePop(ctxt);
xmlXPathReleaseObject(ctxt->context, res); xmlXPathReleaseObject(ctxt->context, res);
} }
ctxt->context->node = NULL;
} }
} else { /* Not a location set */ } else { /* Not a location set */
CHECK_TYPE0(XPATH_NODESET); CHECK_TYPE0(XPATH_NODESET);
obj = valuePop(ctxt); obj = valuePop(ctxt);
oldset = obj->nodesetval; oldset = obj->nodesetval;
ctxt->context->node = NULL;
newlocset = xmlXPtrLocationSetCreate(NULL); newlocset = xmlXPtrLocationSetCreate(NULL);
@ -14100,8 +13929,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathCompOpEval(ctxt, xmlXPathCompOpEval(ctxt,
&comp->steps[op->ch2]); &comp->steps[op->ch2]);
if (ctxt->error != XPATH_EXPRESSION_OK) { if (ctxt->error != XPATH_EXPRESSION_OK) {
xmlXPathFreeObject(obj); xmlXPtrFreeLocationSet(newlocset);
return(0); goto rangeto_error;
} }
res = valuePop(ctxt); res = valuePop(ctxt);
@ -14122,8 +13951,6 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
res = valuePop(ctxt); res = valuePop(ctxt);
xmlXPathReleaseObject(ctxt->context, res); xmlXPathReleaseObject(ctxt->context, res);
} }
ctxt->context->node = NULL;
} }
} }
} }
@ -14131,11 +13958,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
/* /*
* The result is used as the new evaluation set. * The result is used as the new evaluation set.
*/ */
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = NULL;
ctxt->context->contextSize = -1;
ctxt->context->proximityPosition = -1;
valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset)); valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset));
rangeto_error:
xmlXPathReleaseObject(ctxt->context, obj);
ctxt->context->node = oldnode;
ctxt->context->contextSize = oldcs;
ctxt->context->proximityPosition = oldpp;
return (total); return (total);
} }
#endif /* LIBXML_XPTR_ENABLED */ #endif /* LIBXML_XPTR_ENABLED */

9
sdk/lib/3rdparty/libxml2/xzlib.c vendored
View file

@ -562,6 +562,10 @@ xz_decomp(xz_statep state)
"internal error: inflate stream corrupt"); "internal error: inflate stream corrupt");
return -1; return -1;
} }
/*
* FIXME: Remapping a couple of error codes and falling through
* to the LZMA error handling looks fragile.
*/
if (ret == Z_MEM_ERROR) if (ret == Z_MEM_ERROR)
ret = LZMA_MEM_ERROR; ret = LZMA_MEM_ERROR;
if (ret == Z_DATA_ERROR) if (ret == Z_DATA_ERROR)
@ -587,6 +591,11 @@ xz_decomp(xz_statep state)
xz_error(state, LZMA_PROG_ERROR, "compression error"); xz_error(state, LZMA_PROG_ERROR, "compression error");
return -1; return -1;
} }
if ((state->how != GZIP) &&
(ret != LZMA_OK) && (ret != LZMA_STREAM_END)) {
xz_error(state, ret, "lzma error");
return -1;
}
} while (strm->avail_out && ret != LZMA_STREAM_END); } while (strm->avail_out && ret != LZMA_STREAM_END);
/* update available output and crc check value */ /* update available output and crc check value */