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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 42ad4accc4d3fe27fc71edc97eaf948451848756
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 3 09:32:17 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 3 20:45:08 2022 +0100

    cid#1497932 Dereference after null check
    
    pSh->GetOut() is always dereferenced before this check
    
    Change-Id: I1909ec7a726049cc154c5a2300fe921dc8cdcbb7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129399
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 82601c6334f6..696860a66f83 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6554,7 +6554,7 @@ void SwFrame::PaintSwFrameBackground( const SwRect 
&rRect, const SwPageFrame *pP
 
                 // #i125189# We are also done when the new DrawingLayer 
FillAttributes are used
                 // or the FillStyle is set (different from 
drawing::FillStyle_NONE)
-                if(pOut && aFillAttributes)
+                if (aFillAttributes)
                 {
                     if(aFillAttributes->isUsed())
                     {