summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-14 16:02:12 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-14 16:04:05 +0100
commit57601d3849a7aaaa08dce8d910832892204d2922 (patch)
treed94650c630228298578443171c58bfcc853e2171
parent5bac137d48c2436316043ca2be558b9eb00fe87d (diff)
Reset xmlSetGenericErrorFunc after use
...otherwise, unrelated libxml2 clients that try to report errors during exit can fail if this function is still set but the infrastructure behind it is already gone. Change-Id: I7c41fb6770dbff27a71b4b0f82330c608e6e8363
-rw-r--r--unoxml/source/xpath/xpathapi.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index b97b491a6e55..c9d7e64cd709 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -391,6 +391,7 @@ namespace XPath
xmlChar *xStr = (xmlChar*)o1.getStr();
::boost::shared_ptr<xmlXPathObject> const xpathObj(
xmlXPathEval(xStr, xpathCtx.get()), xmlXPathFreeObject);
+ xmlSetGenericErrorFunc(NULL, NULL);
if (0 == xpathObj) {
// OSL_ENSURE(xpathCtx->lastError == NULL, xpathCtx->lastError->message);
throw XPathException();