aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-07 14:09:57 +0000
committerMichael Stahl <michael.stahl@allotropia.de>2021-01-25 11:18:49 +0100
commit32c8ba59dc2d93799f8df28982f7017ca1f304c9 (patch)
treec66988e05747795004a24bf170170763cef9f710
parentac8140fe4424e123bd8cabc5de083035ffbc12ce (diff)
ofz#20517 null-dereference
Change-Id: I443869f848925911ed46e2f547f0dc652b1ff290 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88214 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 08695569fd4fccc1722e7e3c7e0a234699199196)
-rw-r--r--lotuswordpro/qa/cppunit/data/pass/ofz20517-1.lwpbin0 -> 21429 bytes
-rw-r--r--lotuswordpro/source/filter/lwprowlayout.cxx4
2 files changed, 3 insertions, 1 deletions
diff --git a/lotuswordpro/qa/cppunit/data/pass/ofz20517-1.lwp b/lotuswordpro/qa/cppunit/data/pass/ofz20517-1.lwp
new file mode 100644
index 000000000000..de6dcbf1c5d5
--- /dev/null
+++ b/lotuswordpro/qa/cppunit/data/pass/ofz20517-1.lwp
Binary files differ
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index d958486e3553..98acf39085d4 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -379,11 +379,13 @@ void LwpRowLayout::ConvertCommonRow(rtl::Reference<XFTable> const & pXFTable, sa
LwpTableLayout* pTableLayout = GetParentTableLayout();
if (!pTableLayout)
return;
+ LwpTable* pTable = pTableLayout->GetTable();
+ if (!pTable)
+ return;
rtl::Reference<XFRow> xRow(new XFRow);
xRow->SetStyleName(m_StyleName);
- LwpTable* pTable = pTableLayout->GetTable();
sal_uInt8 nCellStartCol,nCellEndCol;
for (sal_uInt8 i = nStartCol; i < nEndCol ; i++)