From bd97c88ac35fee3e5758f70366b2b0f28703287f Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Fri, 3 Jul 2015 14:14:57 -0400 Subject: [PATCH] Deskbar: check dynamic_cast results CID 1108236 and CID 1108237 --- src/apps/deskbar/ExpandoMenuBar.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp index 693613387f..304722a0b6 100644 --- a/src/apps/deskbar/ExpandoMenuBar.cpp +++ b/src/apps/deskbar/ExpandoMenuBar.cpp @@ -1079,6 +1079,8 @@ void TExpandoMenuBar::_DoneTracking(BPoint point) { TTeamMenuItem* lastItem = dynamic_cast(fLastClickedItem); + if (lastItem == NULL) + return; if (!lastItem->ExpanderBounds().Contains(point)) return; @@ -1096,6 +1098,8 @@ void TExpandoMenuBar::_Track(BPoint point, uint32) { TTeamMenuItem* lastItem = dynamic_cast(fLastClickedItem); + if (lastItem == NULL) + return; if (lastItem->ExpanderBounds().Contains(point)) lastItem->SetArrowDirection(BControlLook::B_RIGHT_DOWN_ARROW);