[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/text/redlnitr.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dee22364c5b9583dc8091b827c1af60bab6737e0
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Dec 1 11:21:28 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Dec 1 19:28:37 2020 +0100

    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 at cib.de>
    Tested-by: Jenkins

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))