Hi List, Hi Caolan,
could you please review the attached patch? I pushed it to master as:
http://cgit.freedesktop.org/libreoffice/filters/commit/?id=883e8dbbe6f54a3002ce04d4d03a2d727ee4e2fa
and would like to have it cherrypicked at least to the 3.4 branch.
Best Regards,
Bjoern Michaelsen
--
https://launchpad.net/~bjoern-michaelsen
commit 883e8dbbe6f54a3002ce04d4d03a2d727ee4e2fa
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Commit: Bjoern Michaelsen <bjoern.michael...@canonical.com>
fdo#35668: do not manually free parser context
* reenable complex.unoxml.DOMTest testXDocumentBuilder()
* do not manually free parser context, there is a shared_ptr for that
diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java
index ba276e0..d4b9a5f 100644
--- a/unoxml/qa/complex/unoxml/DOMTest.java
+++ b/unoxml/qa/complex/unoxml/DOMTest.java
@@ -98,8 +98,7 @@ public class DOMTest
//FIXME TODO
}
- // fd#35668 disabled, this crashes LibreOffice
- //@Test
+ @Test
public void testXDocumentBuilder() throws Exception
{
XDocumentBuilder xBuilder =
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 8b38fd3..b5c19d0 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -316,7 +316,6 @@ namespace DOM
saxex.Message = make_error_message(ctxt);
saxex.LineNumber = static_cast<sal_Int32>(ctxt->lastError.line);
saxex.ColumnNumber = static_cast<sal_Int32>(ctxt->lastError.int2);
- xmlFreeParserCtxt(ctxt);
throw saxex;
}
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
