From ac8140fe4424e123bd8cabc5de083035ffbc12ce Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 1 Feb 2020 11:21:10 +0000 Subject: ofz#20447 Null-dereference READ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I76c1c815ab5aaf4548c886a69989fcabe3de5248 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87802 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit fec7e3422f4d1c5b9382518a11d0bb99b12e41c9) --- lotuswordpro/source/filter/lwprowlayout.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index 10eed55d0499..d958486e3553 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -191,7 +191,8 @@ void LwpRowLayout::Read() void LwpRowLayout::ConvertRow(rtl::Reference const & pXFTable,sal_uInt8 nStartCol,sal_uInt8 nEndCol) { LwpTableLayout* pTableLayout = GetParentTableLayout(); - assert(pTableLayout); + if (!pTableLayout) + throw std::runtime_error("missing TableLayout"); LwpTable* pTable = pTableLayout->GetTable(); //calculate the connected cell position -- cgit