core.git: sw/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit c2243d4ced63c5a9764e5d83812285e08e0ea918
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Apr 15 10:07:39 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Apr 15 20:25:20 2024 +0200

    cid#1596278 Dereference after null check
    
    Change-Id: I4fb7b4b113e60dc3cc4aabd49e4dd23dbeeb74f4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166112
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 97eff3e607ec..4e2caf27b276 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1202,7 +1202,7 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine,
         {
             // Do not split immediately in the beginning of page (unless there 
is an at-para or
             // at-char or at-page fly, which pushes the rest down)
-            if (isFirstVisibleFrameInBody(this) && !hasFly(this) && 
!hasAtPageFly(pBodyFrame))
+            if (isFirstVisibleFrameInBody(this) && !hasFly(this) && pBodyFrame 
&& !hasAtPageFly(pBodyFrame))
                 nNew = 0;
         }
     }