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

usb_disk: avoid to use variables after having been free'd()

Browse Source 
CID 10543
This commit is contained in:
Philippe Saint-Pierre
2011-12-29 22:58:52 -05:00
parent eb94592703
commit 258c1019f1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp
+9 -7
View File
@@ -652,18 +652,20 @@ usb_disk_device_added(usb_device newDevice, void **cookie)
mutex_init(&device->lock, "usb_disk device lock"); mutex_init(&device->lock, "usb_disk device lock");
device->notify = create_sem(0, "usb_disk callback notify"); status_t result = device->notify =
if (device->notify < B_OK) { create_sem(0, "usb_disk callback notify");
if (result < B_OK) {
mutex_destroy(&device->lock); mutex_destroy(&device->lock);
free(device); free(device);
return device->notify; return result;
} }
device->interruptLock = create_sem(0, "usb_disk interrupt lock"); result = device->interruptLock = create_sem(0, "usb_disk interrupt lock");
if (device->interruptLock < B_OK) { if (result < B_OK) {
mutex_destroy(&device->lock); mutex_destroy(&device->lock);
free(device); free(device);
return device->interruptLock; return result;
} }
// TODO: handle more than 1 unit // TODO: handle more than 1 unit
@@ -673,7 +675,7 @@ usb_disk_device_added(usb_device newDevice, void **cookie)
for (uint8 i = 0; i < device->lun_count; i++) for (uint8 i = 0; i < device->lun_count; i++)
device->luns[i] = NULL; device->luns[i] = NULL;
status_t result = B_OK; result = B_OK;
TRACE_ALWAYS("device reports a lun count of %d\n", device->lun_count); TRACE_ALWAYS("device reports a lun count of %d\n", device->lun_count);
for (uint8 i = 0; i < device->lun_count; i++) { for (uint8 i = 0; i < device->lun_count; i++) {