[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Michael Stahl (via logerrit)]

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

New commits:
commit 083b3559576a8a0292fb65a4c721686497d76726
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Jun 18 19:16:27 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Jun 19 11:16:24 2020 +0200

    tdf#133981 sw_redlinehide: oops, InsertCnt_() is missing null...
    
    ... pointer check.
    
    (regression from 55576842ec72a748d0bad123d41fa03c89fc136d)
    
    Change-Id: I4478c45d10ac516afd6360e4083b00d667c678fb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96621
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 245fb3d1fb8a695a6bff8f281edd45de4e64f205)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96691

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 9253d7018d70..7cea094eb270 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1701,7 +1701,8 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
                     SwFrame *const pNext(
                         // if there's a parent section, it has been split
                         // into 2 SwSectionFrame already :(
-                        (   pFrame->GetNext()->IsSctFrame()
+                        (   pFrame->GetNext()
+                         && pFrame->GetNext()->IsSctFrame()
                          && pActualSection->GetUpper()
                          && pActualSection->GetUpper()->GetSectionNode() ==
                              static_cast<SwSectionFrame const*>(pFrame->GetNext())->GetSection()->GetFormat()->GetSectionNode())