diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:18:15 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:18:15 +0100 |
| commit | ab4cd7408afad911ebdb6ac767b5bee9b6d638d3 (patch) | |
| tree | 5ed00c7098889547d518a3a998ea39d7d46c8a4b /libxml2 | |
| parent | a1b931cc43089834308a917689702f4a41eb6319 (diff) | |
| parent | a50f71d485e7bc25261afef9e738789d6d6e77c5 (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
dictionaries/prj/build.lst
dictionaries/uk_UA/makefile.mk
hunspell/makefile.mk
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/libxml2-xpath.patch | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/libxml2/libxml2-xpath.patch b/libxml2/libxml2-xpath.patch index e02982f16efe..107de91ed862 100644 --- a/libxml2/libxml2-xpath.patch +++ b/libxml2/libxml2-xpath.patch @@ -1,6 +1,6 @@ ---- misc/libxml2-2.7.6/xpath.c -+++ misc/build/libxml2-2.7.6/xpath.c -@@ -8104,9 +8104,17 @@ +--- misc/libxml2-2.7.6/xpath.c 2009-09-24 17:32:00.000000000 +0200 ++++ misc/build/libxml2-2.7.6/xpath.c 2011-01-03 17:21:08.788256100 +0100 +@@ -8106,9 +8106,17 @@ xmlNodePtr xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); @@ -21,7 +21,7 @@ if (cur == NULL) return(NULL) ; /* ERROR */ if (cur->next != NULL) return(cur->next) ; do { -@@ -8160,8 +8168,13 @@ +@@ -8162,8 +8170,13 @@ xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); @@ -36,7 +36,7 @@ if (cur == NULL) return (NULL); if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) -@@ -8205,8 +8218,8 @@ +@@ -8207,8 +8220,8 @@ cur = ctxt->context->node; if (cur == NULL) return (NULL); @@ -47,3 +47,24 @@ ctxt->ancestor = cur->parent; } 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; + } + |