[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt |binary
 sw/source/filter/xml/xmlimp.cxx                |    5 +++++
 2 files changed, 5 insertions(+)

New commits:
commit c4674e8a1b04314fc45f6a8269cf6519b5fc012b
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Mar 29 17:42:12 2018 +0100

    forcepoint#36 avoid dangling SvTextShapeImportHelper in case of exceptions
    
    Change-Id: Ibdbc047029c31d2b06d2349d68e1cbd9b15fd514
    Reviewed-on: https://gerrit.libreoffice.org/52137
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <michael.st...@cib.de>

diff --git a/sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt 
b/sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt
new file mode 100755
index 000000000000..6442200cdeda
Binary files /dev/null and b/sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt 
differ
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 10332ef1db08..51fc41249e43 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -413,6 +413,11 @@ SwXMLImport::SwXMLImport(
 
 SwXMLImport::~SwXMLImport() throw ()
 {
+    if (HasShapeImport())
+    {
+        SAL_WARN("sw", "endDocument skipped, dropping shapes now to avoid 
dangling SvTextShapeImportHelper pointing to this");
+        ClearShapeImport();
+    }
     delete m_pDocElemTokenMap;
     delete m_pTableElemTokenMap;
     delete m_pTableCellAttrTokenMap;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits