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

Caolán McNamara caolanm at redhat.com
Sat Dec 16 23:02:35 UTC 2017


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

New commits:
commit 9bf3eb328bc85c0a4702056ae3e49c41c5a8b9d9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 16 19:39:10 2017 +0000

    coverity#1426168 Dereference after null check
    
    Change-Id: Ib3ae45a7b012775ee7d540a565c0324f8dcf456e
    Reviewed-on: https://gerrit.libreoffice.org/46611
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index f0bb198cb57f..b4d05f138fbf 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -758,7 +758,7 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             if ( FrameSizeChg( rNew ) )
                 NotifyDrawObj();
             rInvFlags |= 0x7F;
-            if ( RES_FMT_CHG == nWhich )
+            if (pOld && RES_FMT_CHG == nWhich)
             {
                 SwRect aNew( GetObjRectWithSpaces() );
                 SwRect aOld( getFrameArea() );


More information about the Libreoffice-commits mailing list