summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-12-20 15:05:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-12-20 15:05:16 +0000
commit8af88c48060d2b07255793c9be65f4d085b7b48b (patch)
treed9f1e05e3a59439b37a56383c4d2421c032f4922 /vcl
parent110544a8039398c66582ba592310e1a58c076970 (diff)
coverity#1426738 Dereference null return value
Change-Id: I85957928c2f7fa742d379f289192c05e3f4177a8
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/menubarwindow.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 6a8877263b43..f7f933f28a95 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -313,7 +313,7 @@ void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst )
sal_uInt16 nId = pMenu->GetItemId(i);
MenuItemData* pParentItemData = pMenu->GetItemList()->GetData(nId);
-
+ assert(pParentItemData);
mpParentPopup->InsertItem(nId, pParentItemData->aText, pParentItemData->nBits, pParentItemData->sIdent);
mpParentPopup->SetHelpId(nId, pParentItemData->aHelpId);
mpParentPopup->SetHelpText(nId, pParentItemData->aHelpText);
@@ -370,6 +370,7 @@ void MenuBarWindow::KillActivePopup()
{
sal_uInt16 nId = mpParentPopup->GetItemId(i);
MenuItemData* pParentItemData = mpParentPopup->GetItemList()->GetData(nId);
+ assert(pParentItemData);
pParentItemData->pSubMenu = nullptr;
}
}