i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BShelf: Fix crash in the case that view is NULL.

Browse Source 
Also correct some formatting.
Fixes #12584.
This commit is contained in:
Augustin Cavalier
2016-01-12 14:30:13 -05:00
parent 03b1819c04
commit e2dfcf7094
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Shelf.cpp
+6 -5
View File
@@ -1498,15 +1498,16 @@ BShelf::_GetProperty(BMessage *msg, BMessage *reply)
for (int32 i = 0; i < CountReplicants(); i++) { for (int32 i = 0; i < CountReplicants(); i++) {
BView *view = NULL; BView *view = NULL;
ReplicantAt(i, &view, &ID, &err); ReplicantAt(i, &view, &ID, &err);
if (err == B_OK) { if (err != B_OK || view == NULL)
continue;
if (view->Name() != NULL && if (view->Name() != NULL &&
strlen(view->Name()) == strlen(name) && !strcmp(view->Name(), name)) { strlen(view->Name()) == strlen(name) &&
!strcmp(view->Name(), name)) {
replicant = view; replicant = view;
break; break;
} }
err = B_NAME_NOT_FOUND; err = B_NAME_NOT_FOUND;
} }
}
break; break;
} }
case B_ID_SPECIFIER: { case B_ID_SPECIFIER: {
@@ -1516,14 +1517,14 @@ BShelf::_GetProperty(BMessage *msg, BMessage *reply)
for (int32 i = 0; i < CountReplicants(); i++) { for (int32 i = 0; i < CountReplicants(); i++) {
BView *view = NULL; BView *view = NULL;
ReplicantAt(i, &view, &ID, &err); ReplicantAt(i, &view, &ID, &err);
if (err == B_OK) { if (err != B_OK || view == NULL)
continue;
if (ID == id) { if (ID == id) {
replicant = view; replicant = view;
break; break;
} }
err = B_NAME_NOT_FOUND; err = B_NAME_NOT_FOUND;
} }
}
break; break;
} }
default: default: