lotuswordpro/source/filter/lwpcelllayout.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 59d985bbcdf760a368f1dd2edb0926a60e99db12
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Nov 22 20:13:13 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 23 09:51:28 2020 +0100
ofz#27756 null deref
Change-Id: Iccbd368a69f86abe7c7c72df8158db98eaf2bc58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106362
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index cd8d49d7519b..71d0bce8a943 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -66,6 +66,8 @@
#include <lwpfilehdr.hxx>
#include <lwpglobalmgr.hxx>
+#include <sal/log.hxx>
+
#include <xfilter/xfstylemanager.hxx>
#include <xfilter/xfcell.hxx>
#include <xfilter/xfcellstyle.hxx>
@@ -345,7 +347,11 @@ LwpPara* LwpCellLayout::GetLastParaOfPreviousStory()
if (pPreStoryID && !(pPreStoryID->IsNull()))
{
LwpStory* pPreStory =
dynamic_cast<LwpStory*>(pPreStoryID->obj(VO_STORY).get());
- assert(pPreStory);
+ if (!pPreStory)
+ {
+ SAL_WARN("lwp", "unexpected null VO_STORY");
+ return nullptr;
+ }
return
dynamic_cast<LwpPara*>(pPreStory->GetLastPara().obj(VO_PARA).get());
}
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
