Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tracker: Check dereference NULL pointers

Browse Source 
field->Menu() could return NULL, field->Menu()->FindMarked() could return NULL.
This commit is contained in:
John Scipione 2014-07-24 22:55:37 -04:00
parent 8fbb387b1b
commit f0b515eca1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/kits/tracker/FindPanel.cpp
View File

@ -2774,10 +2774,13 @@ FindPanel::SaveAttrState(BMessage* message, int32 index)
BMenuField* field = dynamic_cast<BMenuField*>(FindAttrView("Logic", index));
if (field != NULL) {
BMenuItem* item = field->Menu()->FindMarked();
ASSERT(item);
message->AddInt32("logicalRelation",
item ? field->Menu()->IndexOf(item) : 0);
BMenu* fieldMenu = field->Menu();
if (fieldMenu != NULL) {
BMenuItem* item = fieldMenu->FindMarked();
ASSERT(item != NULL);
message->AddInt32("logicalRelation",
item != NULL ? field->Menu()->IndexOf(item) : 0);
}
}
}