[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-5' - sw/source

[Michael Stahl (via logerrit)]

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

New commits:
commit 8087b77debe5be2ee8124314e38bb77a2f0894f1
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Jun 18 19:16:27 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Jun 24 16:16:02 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 17f47b3972301273716466656e775f3f09d681d8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96692
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit 8e917d54483d916661467dac110e0c5e9774bcc2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96804
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 2a2a59377636..9765451c3aca 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())