[Libreoffice-commits] core.git: xmloff/source

[Michael Stahl]

 xmloff/source/core/xmlimp.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8daf6707ef203b26a744140f74d7cd231a25f0dd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 6 23:37:51 2016 +0200

    xmloff: fix crash in ~XMLParaContext on fdo72541-1.fodt
    
    Change-Id: I3310699020bfea085eb62c50a7d5de25af51c1b1

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index c061d8e..0e8f50a 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -449,6 +449,10 @@ SvXMLImport::~SvXMLImport() throw ()
 {
     if (mxEventListener.is() && mxModel.is())
         mxModel->removeEventListener(mxEventListener);
+    // clear context stacks first in case of parse error because the context
+    // class dtors are full of application logic
+    while (!maFastContexts.empty()) { maFastContexts.pop(); }
+    while (!maContexts.empty()) { maContexts.pop(); }
 }
 
 namespace