summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-01 12:04:26 +0000
committerThorsten Behrens <thorsten.behrens@allotropia.de>2021-04-09 23:22:08 +0200
commiteb960bb3dd3eb11cefaf85f7434f55f4a0e3e71b (patch)
tree3f825af3f5b0af8276b672523ca81f74864bec4b
parentofz#18526 sw: WW8 import: don't insert control characters (diff)
downloadcore-eb960bb3dd3eb11cefaf85f7434f55f4a0e3e71b.tar.gz
core-eb960bb3dd3eb11cefaf85f7434f55f4a0e3e71b.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)
-rw-r--r--lotuswordpro/source/filter/lwprowlayout.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index e339ecdf0df6..1db191350c3d 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -282,14 +282,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)