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

Caolán McNamara caolanm at redhat.com
Sat Dec 16 15:57:51 UTC 2017


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

New commits:
commit 6a9f2f04d29e7df748ed4b51081ae5035cf46f56
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 16 15:50:48 2017 +0000

    ofz: Null-deref
    
    Change-Id: I2a0a6fdfe678e898d73e2bdbfe67764300bde494

diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 18d3a45f62af..d422f13e5f0f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3960,6 +3960,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
         while( m_aContexts.size() > m_nContextStAttrMin )
         {
             std::unique_ptr<HTMLAttrContext> xCntxt(PopContext());
+            if (!xCntxt)
+                break;
             ClearContext(xCntxt.get());
         }
     }


More information about the Libreoffice-commits mailing list