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

Patch by Bryce Groff with changes by myself:

Browse Source 
CreateChild():
* Added missing creation and initialization of the child's fData.
* Name and parameters were set on the parent, not the child.
* Fixed leak on error.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31236 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-06-25 15:41:11 +00:00
parent 89175c4c50
commit 6eb9c264e7
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/storage/disk_device/MutablePartition.cpp
+17 -4
View File
@@ -352,7 +352,6 @@ BMutablePartition::CreateChild(int32 index, BMutablePartition** _child)
return B_NO_MEMORY; return B_NO_MEMORY;
} }
partition->fDelegate = delegate; partition->fDelegate = delegate;
// TODO: Any further initialization required?
// add the child // add the child
BMutablePartition* child = delegate->MutablePartition(); BMutablePartition* child = delegate->MutablePartition();
@@ -361,6 +360,20 @@ BMutablePartition::CreateChild(int32 index, BMutablePartition** _child)
return B_NO_MEMORY; return B_NO_MEMORY;
} }
child->fParent = this; child->fParent = this;
child->fData = new(nothrow) user_partition_data;
if (!child->fData) {
fChildren.RemoveItem(child);
delete partition;
return B_NO_MEMORY;
}
memset(child->fData, 0, sizeof(user_partition_data));
child->fData->id = -1;
child->fData->status = B_PARTITION_UNINITIALIZED;
child->fData->volume = -1;
child->fData->index = -1;
child->fData->disk_system = -1;
*_child = child; *_child = child;
@@ -381,11 +394,11 @@ BMutablePartition::CreateChild(int32 index, const char* type, const char* name,
return error; return error;
// set the name, type, and parameters // set the name, type, and parameters
error = SetType(type); error = child->SetType(type);
if (error == B_OK) if (error == B_OK)
error = SetName(name); error = child->SetName(name);
if (error == B_OK) if (error == B_OK)
error = SetParameters(parameters); error = child->SetParameters(parameters);
// cleanup on error // cleanup on error
if (error != B_OK) { if (error != B_OK) {