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

[Caolán McNamara (via logerrit)]

 sw/source/core/text/txtftn.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 445698dca110520673c89138b80e822a5d8086b5
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jun 1 20:49:22 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jun 2 11:29:00 2023 +0200

    Related: tdf#122081 null-deref of SwFootnoteFrame
    
    load doc, ctrl+end, ctrl+home, ctrl+6 enter 29, return, wheel scroll
    down 7 or 8 times and this null-deref
    
    Change-Id: I1963a89e3223de89f3414e435accd8d8ebfe80a9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152511
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit 389a8d52d9961f89c0b2847b30ee1ca59a8fdc80)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152447
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index c86c1bc4ab0d..035158e2bd25 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -664,7 +664,7 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote 
*pFootnote, const SwTwips nDea
             mbInFootnoteConnect = false;
             return;
         }
-        else if( pSrcFrame )
+        else if (pSrcFrame && pFootnoteFrame)
         {
             SwFootnoteBossFrame *pFootnoteBoss = 
pFootnoteFrame->FindFootnoteBossFrame();
             if( !pFootnoteBoss->IsInSct() ||