Skip to content

C
core
Kaydet (Commit) 349b218a authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#704904 Dereference after null check 

Change-Id: I5ef95b90f7eeb4777f9a847c42a09f2fab5f1e0c
üst 41a5730b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
sw/source/core/layout/flyincnt.cxx
Dosyayı görüntüle @ 349b218a
...@@ -84,12 +84,13 @@ void SwFlyInCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) ...@@ -84,12 +84,13 @@ void SwFlyInCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{ {
bool bCallPrepare = false; bool bCallPrepare = false;
sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
if( RES_ATTRSET_CHG == nWhich ) if (RES_ATTRSET_CHG == nWhich && pNew)
{ {
if( SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()-> if(pOld &&
GetItemState( RES_SURROUND, false ) || (SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->
GetItemState(RES_SURROUND, false) ||
SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()-> SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->
GetItemState( RES_FRMMACRO, false ) ) GetItemState(RES_FRMMACRO, false)) )
{ {
SwAttrSetChg aOld( *(SwAttrSetChg*)pOld ); SwAttrSetChg aOld( *(SwAttrSetChg*)pOld );
SwAttrSetChg aNew( *(SwAttrSetChg*)pNew ); SwAttrSetChg aNew( *(SwAttrSetChg*)pNew );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment