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

Tracker: unchecked return value, CID 602465

Browse Source 
Check that refs is not NULL and that refs->FindData() succeeds.

Also, explicit NULL check
This commit is contained in:
John Scipione 2014-07-18 19:03:18 -04:00
parent 676721d267
commit d89f61f0e0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/kits/tracker/FSUtils.cpp
View File

@ -3344,15 +3344,16 @@ _TrackerLaunchAppWithDocuments(const entry_ref* appRef, const BMessage* refs,
// close possible parent window, if specified
const node_ref* nodeToClose = 0;
ssize_t numBytes;
refs->FindData("nodeRefsToClose", B_RAW_TYPE,
(const void**)&nodeToClose, &numBytes);
if (nodeToClose)
if (refs != NULL && refs->FindData("nodeRefsToClose", B_RAW_TYPE,
(const void**)&nodeToClose, &numBytes) == B_OK
&& nodeToClose != NULL) {
dynamic_cast<TTracker*>(be_app)->CloseParent(*nodeToClose);
}
} else {
alertString.SetTo(B_TRANSLATE("Could not open \"%name\" (%error). "));
alertString.ReplaceFirst("%name", appRef->name);
alertString.ReplaceFirst("%error", strerror(error));
if (refs && openWithOK && error != B_SHUTTING_DOWN) {
if (refs != NULL && openWithOK && error != B_SHUTTING_DOWN) {
alertString << B_TRANSLATE_NOCOLLECT(kFindAlternativeStr);
BAlert* alert = new BAlert("", alertString.String(),
B_TRANSLATE("Cancel"), B_TRANSLATE("Find"), 0,