diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-07 14:09:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-07 20:48:51 +0100 |
| commit | 08695569fd4fccc1722e7e3c7e0a234699199196 (patch) | |
| tree | 02069d8125a30c5dfaedee887086a4b045deaed1 /lotuswordpro | |
| parent | 99e044604c362d97f8ef2b10157e2c1969916049 (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>
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/qa/cppunit/data/pass/ofz20517-1.lwp | bin | 0 -> 21429 bytes | |||
| -rw-r--r-- | lotuswordpro/source/filter/lwprowlayout.cxx | 4 |
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 Binary files differnew file mode 100644 index 000000000000..de6dcbf1c5d5 --- /dev/null +++ b/lotuswordpro/qa/cppunit/data/pass/ofz20517-1.lwp diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index 7a564bdd5849..811b7abb762e 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++) |