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

[Caolán McNamara]

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

New commits:
commit 71129c2aa3fc9c4d68e5d16c80c750115487b9b4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 17 23:36:07 2017 +0000

    ofz: Null-deref
    
    Change-Id: Ice265d7c868b44c6673f3960dffc227d8352ccd0

diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index d422f13e5f0f..1361c574fcea 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3952,7 +3952,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
 
         // If there was an adjustment set for the cell, we need to close it
         std::unique_ptr<HTMLAttrContext> xCntxt(PopContext());
-        EndContext(xCntxt.get());
+        if (xCntxt)
+            EndContext(xCntxt.get());
     }
     else
     {