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

[Caolán McNamara]

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

New commits:
commit f03ad9ee3458c76db21c10e18bdb49d27f7be1c3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 26 21:00:35 2017 +0000

    ofz#4796 Null-dereference
    
    Change-Id: Iad537d2bb2bed1225e5647a918c923e6d95aea75

diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 33c7de3e6fe3..6d3c6e50894f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -4772,8 +4772,11 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
 
     // If there's an adjustment for the cell, we need to close it
     std::unique_ptr<HTMLAttrContext> xCntxt(PopContext());
-    EndContext(xCntxt.get());
-    xCntxt.reset();
+    if (xCntxt)
+    {
+        EndContext(xCntxt.get());
+        xCntxt.reset();
+    }
 
     SetAttr( false );