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

Caolán McNamara caolanm at redhat.com
Wed Dec 13 08:09:34 UTC 2017


 sw/source/filter/html/swhtml.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit cd431435f99c5edc249e8a1aa6685b87c6265604
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 12 20:34:07 2017 +0000

    ofz: Indirect-leak
    
    Change-Id: Ib0ae0baad1f34a06d67391fa9957b3f822ee50e4
    Reviewed-on: https://gerrit.libreoffice.org/46353
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0f5810542878..a5dfee53c528 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -412,6 +412,14 @@ SwHTMLParser::~SwHTMLParser()
 #ifdef DBG_UTIL
     OSL_ENSURE( !m_nContinue, "DTOR in continue!" );
 #endif
+
+    OSL_ENSURE(m_aContexts.empty(), "There are still contexts on the stack");
+    while (!m_aContexts.empty())
+    {
+        std::unique_ptr<HTMLAttrContext> xCntxt(PopContext());
+        ClearContext(xCntxt.get());
+    }
+
     bool bAsync = m_xDoc->IsInLoadAsynchron();
     m_xDoc->SetInLoadAsynchron( false );
     m_xDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, m_bOldIsHTMLMode);


More information about the Libreoffice-commits mailing list