Changeset 43690 in vbox for trunk/src/VBox

Timestamp:

Oct 19, 2012 2:06:13 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

81523

Message:

BusLogic: Fixed sense buffer allocation.

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -1343 +1343 @@
         PPDMDEVINS  pDevIns = pTaskState->CTX_SUFF(pTargetDevice)->CTX_SUFF(pBusLogic)->CTX_SUFF(pDevIns);
         RTGCPHYS GCPhysAddrSenseBuffer = (RTGCPHYS)pTaskState->CommandControlBlockGuest.u32PhysAddrSenseData;
-        uint32_t cbSenseBuffer = pTaskState->CommandControlBlockGuest.cbSenseData;
 
         PDMDevHlpPhysWrite(pDevIns, GCPhysAddrSenseBuffer, pTaskState->pbSenseBuffer, cbSenseBuffer);
@@ -1364 +1363 @@
     uint32_t   cbSenseBuffer;
 
+    pTaskState->pbSenseBuffer = NULL;
+
     cbSenseBuffer = buslogicConvertSenseBufferLength(pTaskState->CommandControlBlockGuest.cbSenseData);
-
-    pTaskState->pbSenseBuffer = (uint8_t *)RTMemAllocZ(cbSenseBuffer);
-    if (!pTaskState->pbSenseBuffer)
-        return VERR_NO_MEMORY;
+    if (cbSenseBuffer)
+    {
+        pTaskState->pbSenseBuffer = (uint8_t *)RTMemAllocZ(cbSenseBuffer);
+        if (!pTaskState->pbSenseBuffer)
+            return VERR_NO_MEMORY;
+    }
 
     return VINF_SUCCESS;
@@ -2509 +2512 @@
     AssertMsgRC(rc, ("Alloc failed rc=%Rrc\n", rc));
 
-    if (pTaskState->CommandControlBlockGuest.cbSenseData)
-    {
-        rc = buslogicSenseBufferAlloc(pTaskState);
-        AssertMsgRC(rc, ("Mapping sense buffer failed rc=%Rrc\n", rc));
-    }
+    rc = buslogicSenseBufferAlloc(pTaskState);
+    AssertMsgRC(rc, ("Mapping sense buffer failed rc=%Rrc\n", rc));
 
     /* Check if device is present on bus. If not return error immediately and don't process this further. */