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

[Caolán McNamara]

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

New commits:
commit 6af638218496e6af93b3a0cf7f17768421e96903
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 13 11:46:02 2018 +0000

    Null dereference
    
    Change-Id: Ifda10738a4d4d97ba62ae3fc8804638621b24686
    Reviewed-on: https://gerrit.libreoffice.org/49638
    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 9da4852c1398..78d166574959 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -819,7 +819,8 @@ void LwpTableLayout::Read()
  */
 void LwpTableLayout::XFConvert(XFContentContainer* pCont)
 {
-
+    if (!m_pXFTable)
+        throw std::runtime_error("missing table");
     pCont->Add(m_pXFTable.get());
 }
 /**
@@ -1141,8 +1142,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
                         }
                         else
                         {
-                            //Hidden cell would not be in cellsmap
-                            assert(false);
+                            throw std::runtime_error("Hidden cell would not be in cellsmap");
                         }
                     }
                     pCellList = dynamic_cast<LwpCellList*>(pCellList->GetNextID().obj().get());
@@ -1152,7 +1152,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
         }
 
     }catch (...) {
-        assert(false);
+        SAL_WARN("lwp", "bad PutCellVals");
     }
 }