diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2020-12-01 11:21:28 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@cib.de> | 2020-12-01 19:28:37 +0100 |
commit | dee22364c5b9583dc8091b827c1af60bab6737e0 (patch) | |
tree | 5903673f0281ba4553e36b6320e77b60ce73e496 | |
parent | ebe25a18c4d2aa3fc5e1c8c57f14d71ce50cb15c (diff) |
sw_fieldmarkhide: CID#1470358: Null pointer dereferences
Change-Id: Ia61e83d9e62bc03d69ca640d3ee9ab27995b8a92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106961
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
-rw-r--r-- | sw/source/core/text/redlnitr.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 3a6a2749f8a4..b27f03ead354 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -598,7 +598,8 @@ void SwAttrIter::CtorInitAttrIter(SwTextNode & rTextNode, // TODO this is true initially but after delete ops it may be false... need to delete m_pMerged somewhere? // assert(SwRedlineTable::npos != nRedlPos); // false now with fieldmarks - assert(pRootFrame->GetFieldmarkMode() != sw::FieldmarkMode::ShowBoth + assert(!pRootFrame + || pRootFrame->GetFieldmarkMode() != sw::FieldmarkMode::ShowBoth || SwRedlineTable::npos != nRedlPos || m_pMergedPara->extents.size() <= 1); } if (!(pExtInp || m_pMergedPara || SwRedlineTable::npos != nRedlPos)) |