diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-01 12:04:26 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-10-19 13:57:43 +0200 |
| commit | 5aceaa5f4b826cb0f4508125ad06401c4303f498 (patch) | |
| tree | 52b261bab20e70e634d41c55b36e91823bb2e12c /lotuswordpro/source/filter/lwprowlayout.cxx | |
| parent | nss: fix parallel build race in nsinstall.py (diff) | |
| download | core-5aceaa5f4b826cb0f4508125ad06401c4303f498.tar.gz core-5aceaa5f4b826cb0f4508125ad06401c4303f498.zip | |
ofz#20456 Null-dereference READ
this is the first honggfuzz (honggfuzz_asan_libreoffice) report I've seen to date
Change-Id: Iac733aa63c7c94d9454b9c8596340dc2286393c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87803
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 0754e581b0d8569dd08cf26f88678754f249face)
Diffstat (limited to 'lotuswordpro/source/filter/lwprowlayout.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwprowlayout.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index a0a90a417c69..4348496be15e 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -281,14 +281,15 @@ void LwpRowLayout::RegisterCurRowStyle(XFRow* pXFRow,sal_uInt16 nRowMark) { pRowStyle = static_cast<XFRowStyle*>( pXFStyleManager->FindStyle(pTableLayout->GetDefaultRowStyleName())); - fHeight += pRowStyle->GetRowHeight(); } else { pRowStyle = static_cast<XFRowStyle*>( pXFStyleManager->FindStyle(iter->second->GetStyleName())); - fHeight+=pRowStyle->GetRowHeight(); } + if (!pRowStyle) + throw std::runtime_error("missing RowStyle"); + fHeight += pRowStyle->GetRowHeight(); } if (m_nDirection & 0x0030) |