From d89f61f0e00185ee453ce25a60686bb6a79b59d1 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Fri, 18 Jul 2014 19:03:18 -0400 Subject: [PATCH] Tracker: unchecked return value, CID 602465 Check that refs is not NULL and that refs->FindData() succeeds. Also, explicit NULL check --- src/kits/tracker/FSUtils.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp index 5bde0fbcde..2340559dd6 100644 --- a/src/kits/tracker/FSUtils.cpp +++ b/src/kits/tracker/FSUtils.cpp @@ -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(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,