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

[Caolán McNamara]

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

New commits:
commit 79a13ea778265a9af9ebe2ce867063eece3f5f9d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 13 08:46:26 2017 +0000

    ofz: Null-deref
    
    Change-Id: I5fefd9ba125c3769cdcb8a97f1a00a2aad5b21f4
    Reviewed-on: https://gerrit.libreoffice.org/46369
    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 a5dfee53c528..ef5b157fbe9c 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -414,6 +414,8 @@ SwHTMLParser::~SwHTMLParser()
 #endif
 
     OSL_ENSURE(m_aContexts.empty(), "There are still contexts on the stack");
+    OSL_ENSURE(!m_nContextStMin, "There are protected contexts");
+    m_nContextStMin = 0;
     while (!m_aContexts.empty())
     {
         std::unique_ptr<HTMLAttrContext> xCntxt(PopContext());