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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 81c5d2f42afa6d0bf5a612770b7e4fee5ebf4d28
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 9 09:07:37 2018 +0000

    ofz#6800 Null dereference
    
    Change-Id: I12a0b386917af64f489706ab960f11559ac6122a
    Reviewed-on: https://gerrit.libreoffice.org/50988
    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/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index c4a24347b0c4..4f1bf06cd724 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -893,7 +893,10 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable, rtl::Reference<XFTable>
     double fHeight = 0;
     OUString styleName;
     std::unique_ptr<XFRowStyle> xRowStyle(new XFRowStyle);
-    styleName = pTmpTable->GetRow(1)->GetStyleName();
+    XFRow* pRow = pTmpTable->GetRow(1);
+    if (!pRow)
+        throw std::runtime_error("missing row");
+    styleName = pRow->GetStyleName();
 
     // get settings of the row and assign them to new row style
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();