diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-05-13 20:39:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-15 10:21:22 +0100 |
| commit | 0ac3a94c9f7bffe27ec1e07c4cc73cf2425b3898 (patch) | |
| tree | 2a50912bb7ebf0f20ae2f34e8932e33a5656a437 | |
| parent | coverity#441607 Dereference null return value (diff) | |
| download | core-0ac3a94c9f7bffe27ec1e07c4cc73cf2425b3898.tar.gz core-0ac3a94c9f7bffe27ec1e07c4cc73cf2425b3898.zip | |
coverity#440876 Dereference null return value
Change-Id: I7d00c3a3c1a12176e4b1ab74712aabeb2f1cf90e
| -rw-r--r-- | framework/source/uielement/toolbarsmenucontroller.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index a90b59790a78..cca476f6796d 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -556,7 +556,11 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev { SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( xPopupMenu ); - PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); + PopupMenu* pVCLPopupMenu = pXPopupMenu ? (PopupMenu *)pXPopupMenu->GetMenu() : NULL; + + assert(pVCLPopupMenu); + if (!pVCLPopupMenu) + return; for ( sal_uInt16 i = 0; i < pVCLPopupMenu->GetItemCount(); i++ ) { |