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

Tracker: Unchecked dynamic_cast, CID 1032264

Browse Source 
Also some minor refactoring, rename string to textEntryString,
check before dereferencing potentially NULL pointers.
This commit is contained in:
John Scipione 2014-07-24 22:22:53 -04:00
parent 08b7ddae76
commit 861d997e49
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2667,23 +2667,35 @@ FindPanel::RestoreAttrState(const BMessage &message, int32 index)
}
// decode attribute text
BString bstring = "TextEntry";
bstring << index;
BString textEntryString = "TextEntry";
textEntryString << index;
BTextControl* textControl
= dynamic_cast<BTextControl*>(FindAttrView(bstring.String(), index));
ASSERT(textControl);
= dynamic_cast<BTextControl*>(FindAttrView(textEntryString.String(), index));
ASSERT(textControl != NULL);
const char* string;
if (message.FindString("attrViewText", index, &string) == B_OK)
if (textControl != NULL && textControl->TextView() != NULL
&& message.FindString("attrViewText", index, &string) == B_OK) {
textControl->TextView()->SetText(string);
}
int32 logicMenuSelectedIndex;
BMenuField* field = dynamic_cast<BMenuField*>(FindAttrView("Logic", index));
if (message.FindInt32("logicalRelation", index,
&logicMenuSelectedIndex) == B_OK) {
if (field)
field->Menu()->ItemAt(logicMenuSelectedIndex)->SetMarked(true);
else
AddLogicMenu(index, logicMenuSelectedIndex == 0);
BMenuField* field = dynamic_cast<BMenuField*>(FindAttrView("Logic", index));
if (field != NULL) {
BMenu* fieldMenu = field->Menu();
if (fieldMenu != NULL) {
BMenuItem* logicItem = fieldMenu->ItemAt(logicMenuSelectedIndex);
if (logicItem != NULL) {
logicItem->SetMarked(true);
return;
}
}
}
AddLogicMenu(index, logicMenuSelectedIndex == 0);
}
}
@ -2711,10 +2723,10 @@ FindPanel::SaveAttrState(BMessage* message, int32 index)
message->AddString("subMenuSelection", label);
// encode attribute text
BString string = "TextEntry";
string << index;
BString textEntryString = "TextEntry";
textEntryString << index;
BTextControl* textControl
= dynamic_cast<BTextControl*>(FindAttrView(string.String(), index));
= dynamic_cast<BTextControl*>(FindAttrView(textEntryString.String(), index));
ASSERT(textControl != NULL);