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

* fixed memory leak: if InitKernelAccess failed data was not deleted

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23703 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2008-01-22 17:54:59 +00:00
parent f2e973d406
commit 5b6cdc4c7b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/ehci.cpp
+3 -1
View File
@@ -847,8 +847,10 @@ EHCI::AddPendingTransfer(Transfer *transfer, ehci_qh *queueHead,
return B_NO_MEMORY; return B_NO_MEMORY;
status_t result = transfer->InitKernelAccess(); status_t result = transfer->InitKernelAccess();
if (result < B_OK) if (result < B_OK) {
delete data;
return result; return result;
}
data->transfer = transfer; data->transfer = transfer;
data->queue_head = queueHead; data->queue_head = queueHead;
src/add-ons/kernel/busses/usb/uhci.cpp
+6 -2
View File
@@ -754,8 +754,10 @@ UHCI::AddPendingTransfer(Transfer *transfer, Queue *queue,
return B_NO_MEMORY; return B_NO_MEMORY;
status_t result = transfer->InitKernelAccess(); status_t result = transfer->InitKernelAccess();
if (result < B_OK) if (result < B_OK) {
delete data;
return result; return result;
}
data->transfer = transfer; data->transfer = transfer;
data->queue = queue; data->queue = queue;
@@ -795,8 +797,10 @@ UHCI::AddPendingIsochronousTransfer(Transfer *transfer, uhci_td **isoRequest,
return B_NO_MEMORY; return B_NO_MEMORY;
status_t result = transfer->InitKernelAccess(); status_t result = transfer->InitKernelAccess();
if (result < B_OK) if (result < B_OK) {
delete data;
return result; return result;
}
data->transfer = transfer; data->transfer = transfer;
data->descriptors = isoRequest; data->descriptors = isoRequest;