[haiku-commits] haiku: hrev47469 - src/system/kernel/disk_device_manager
- From: jessica.l.hamilton@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 6 Jul 2014 04:13:57 +0200 (CEST)
hrev47469 adds 1 changeset to branch 'master'
old head: ba38276d1995b0538693445a5b65ef03c5c675df
new head: d71c5a1ebf03722cf032669c54a7b33f0498a4d1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=d71c5a1+%5Eba38276
----------------------------------------------------------------------------
d71c5a1: #10717: Addressing issues brought up by Axel and Gerasim
Signed-off-by: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47469
Commit: d71c5a1ebf03722cf032669c54a7b33f0498a4d1
URL: http://cgit.haiku-os.org/haiku/commit/?id=d71c5a1
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Jul 6 00:17:56 2014 UTC
Committer: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Commit-Date: Sun Jul 6 02:02:12 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/10717
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 3 deletions(-)
src/system/kernel/disk_device_manager/KPartitioningSystem.cpp | 6 +++---
----------------------------------------------------------------------------
diff --git a/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
b/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
index e36070d..4d350d5 100644
--- a/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
+++ b/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
@@ -69,10 +69,10 @@ KPartitioningSystem::Identify(KPartition *partition, void
**cookie)
int fd = -1;
if (partition->Open(O_RDONLY, &fd) != B_OK)
return -1;
-
- // if BlockSize is 0, identify_partition will cause a KDL
- if (partition->BlockSize() == 0)
+ if (partition->BlockSize() == 0) {
+ close(fd);
return -1;
+ }
float result = fModule->identify_partition(fd,
partition->PartitionData(),
cookie);
Other related posts:
- » [haiku-commits] haiku: hrev47469 - src/system/kernel/disk_device_manager - jessica . l . hamilton
