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

* CID 874 and CID 875: Fix leaking the session object GetSession() allocates.

Browse Source 
* CID 876: Fix leaking the disc object in case it fails to initialize.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27496 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2008-09-13 19:26:04 +00:00
parent 21527c4e77
commit 7c57e58de9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/partitioning_systems/session/session.cpp
+3 -1
View File
@@ -54,6 +54,8 @@ identify_partition(int fd, partition_data *partition, void **cookie)
*cookie = static_cast<void*>(disc); *cookie = static_cast<void*>(disc);
result = 0.7; result = 0.7;
} }
delete disc;
} }
PRINT(("returning %ld\n", int32(result * 10000))); PRINT(("returning %ld\n", int32(result * 10000)));
return result; return result;
@@ -89,6 +91,7 @@ scan_partition(int fd, partition_data *partition, void *cookie)
child->block_size = session->BlockSize(); child->block_size = session->BlockSize();
child->flags |= session->Flags(); child->flags |= session->Flags();
child->type = strdup(session->Type()); child->type = strdup(session->Type());
delete session;
if (!child->type) { if (!child->type) {
error = B_NO_MEMORY; error = B_NO_MEMORY;
break; break;
@@ -130,4 +133,3 @@ partition_module_info *modules[] = {
&sSessionModule, &sSessionModule,
NULL NULL
}; };