strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS impress208

Browse source
This commit is contained in:
Kurt Zenker 2011-01-06 14:58:44 +01:00
commit a51691fe4e
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libxml2/libxml2-xpath.patch
View file

@ -1,6 +1,6 @@
--- misc/libxml2-2.7.6/xpath.c --- misc/libxml2-2.7.6/xpath.c 2009-09-24 17:32:00.000000000 +0200
+++ misc/build/libxml2-2.7.6/xpath.c +++ misc/build/libxml2-2.7.6/xpath.c 2011-01-03 17:21:08.788256100 +0100
@@ -8104,9 +8104,17 @@ @@ -8106,9 +8106,17 @@
xmlNodePtr xmlNodePtr
xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) {
if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL);
@ -21,7 +21,7 @@
if (cur == NULL) return(NULL) ; /* ERROR */ if (cur == NULL) return(NULL) ; /* ERROR */
if (cur->next != NULL) return(cur->next) ; if (cur->next != NULL) return(cur->next) ;
do { do {
@@ -8160,8 +8168,13 @@ @@ -8162,8 +8170,13 @@
xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur)
{ {
if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL);
@ -36,7 +36,7 @@
if (cur == NULL) if (cur == NULL)
return (NULL); return (NULL);
if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE))
@@ -8205,8 +8218,8 @@ @@ -8207,8 +8220,8 @@
cur = ctxt->context->node; cur = ctxt->context->node;
if (cur == NULL) if (cur == NULL)
return (NULL); return (NULL);
@ -47,3 +47,24 @@
ctxt->ancestor = cur->parent; ctxt->ancestor = cur->parent;
} }
if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE))
@@ -11737,11 +11750,16 @@
if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
xmlXPathObjectPtr tmp;
- /* pop the result */
+ /* pop the result if any */
tmp = valuePop(ctxt);
- xmlXPathReleaseObject(xpctxt, tmp);
- /* then pop off contextObj, which will be freed later */
- valuePop(ctxt);
+ if (tmp != contextObj) {
+ /*
+ * Free up the result
+ * then pop off contextObj, which will be freed later
+ */
+ xmlXPathReleaseObject(xpctxt, tmp);
+ valuePop(ctxt);
+ }
goto evaluation_error;
}