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

DiskUsage: Fix CID 1288122

Browse Source 
In hrev48870 I made some updates to DiskUsage which accidentally caused this
CID.

Both the volume and item pointers were going out of scope without being deleted
in the error case leading to a resource leak. This commit seeks to fix the
problem by creating these objects as late as possible after the error checking.

tempVolume, which, as it's name implies, is created temporarily on the stack is
used instead of volume up until the point that AddTab() requires a more
permanent heap-stored volume pointer. Same goes for the VolumeView and
VolumeTab. name is created temporarily on the stack as well which works
because it is copied when passed into VolumeView constructor by the grandparent
BHandler before going out of scope.
This commit is contained in:
John Scipione
2015-03-13 16:28:47 -04:00
parent 24bb6e132d
commit 93e5d9fa15
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/diskusage/ControlsView.cpp
+15 -12
View File
@@ -224,20 +224,23 @@ ControlsView::VolumeTabView::AttachedToWindow()
BVolume tempVolume;
while (fVolumeRoster->GetNextVolume(&tempVolume) == B_OK) {
if (tempVolume.IsPersistent()) {
BVolume* volume = new BVolume(tempVolume);
VolumeTab* item = new VolumeTab(volume);
char name[B_PATH_NAME_LENGTH];
if (volume->GetName(name) != B_OK)
continue;
if (!tempVolume.IsPersistent())
continue;
if (strcmp(name, "system") == 0
|| strcmp(name, "config") == 0) {
// Don't include virtual volumes.
continue;
}
AddTab(new VolumeView(name, volume), item);
char name[B_PATH_NAME_LENGTH];
if (tempVolume.GetName(name) != B_OK)
continue;
if (strcmp(name, "system") == 0
|| strcmp(name, "config") == 0) {
// Don't include virtual volumes.
continue;
}
BVolume* volume = new BVolume(tempVolume);
VolumeView* volumeView = new VolumeView(name, volume);
VolumeTab* volumeTab = new VolumeTab(volume);
AddTab(volumeView, volumeTab);
}
// Begin watching mount and unmount events.