coverity#704914 Dereference after null check

Change-Id: Ib52b2d6cd7339320b7ec00d874f8c7c1de87e59d

coverity#704914 Dereference after null check
Change-Id: Ib52b2d6cd7339320b7ec00d874f8c7c1de87e59d
1b924d5b · Caolán McNamara · 64f41f1a · 1b924d5b
Kaydet (Commit) 1b924d5b authored Mar 15, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

sectfrm.cxx sw/source/core/layout/sectfrm.cxx +6 -2

No files found.
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2357,8 +2357,12 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
        case RES_COL:
            if( !IsInFtn() )
            {
-                ChgColumns( *(const SwFmtCol*)pOld, *(const SwFmtCol*)pNew );
-                rInvFlags |= 0x11;
+                assert(pOld && pNew);
+                if (pOld && pNew)
+                {
+                    ChgColumns( *(const SwFmtCol*)pOld, *(const SwFmtCol*)pNew );
+                    rInvFlags |= 0x11;
+                }
            }
            break;