summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-04-08 16:05:47 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-04-08 16:26:28 +0100
commitceebfc0436e878e1cf7e428f88567ec3cde2cc8b (patch)
tree476dd773159c7dc5799399a46f2f359e9bc8ace5
parentf36d55edf7cf2118184ff21db5f95291572b9d02 (diff)
coverity#704790 Dereference after null check
Change-Id: I276b404405b9717a03d43a24c6ffecd5c6553969
-rw-r--r--sfx2/source/control/bindings.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index d42be952f725..2331cc3b0df9 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1509,12 +1509,12 @@ void SfxBindings::UpdateControllers_Impl
continue;
}
- if ( SFX_ITEM_DISABLED == eState || !pEnumItem->IsEnabled( pSlave->GetSlotId()) )
+ if ( SFX_ITEM_DISABLED == eState || (pEnumItem && !pEnumItem->IsEnabled( pSlave->GetSlotId())) )
{
// disabled
pEnumCache->SetState(SFX_ITEM_DISABLED, 0);
}
- else if ( SFX_ITEM_AVAILABLE == eState )
+ else if ( SFX_ITEM_AVAILABLE == eState && pEnumItem )
{
// Determine enum value
sal_uInt16 nValue = pEnumItem->GetEnumValue();