Changeset 59796 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Feb 24, 2016 10:59:59 AM (9 years ago)

Author:

vboxsync

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

105676

Message:

VUSB: Update pointer pointers to pVUsb and pVUsb->pUrb when reallocating message URB structures

File:

• trunk/src/VBox/Devices/USB/VUSBUrb.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/USB/VUSBUrb.cpp

@@ -631 +631 @@
         //pExtra->Urb.pVUsb->pNext = NULL;
         //pExtra->Urb.pVUsb->ppPrev = NULL;
+        pExtra->Urb.pVUsb->pUrb = &pExtra->Urb;
         pExtra->Urb.pVUsb->pDev = pUrb->pVUsb->pDev;
         pExtra->Urb.pVUsb->pfnFree = vusbMsgFreeUrb;
@@ -688 +689 @@
         LogFlow(("vusbMsgSetup: Replacing canceled pExtra=%p with %p.\n", pExtra, pvNew));
         pPipe->pCtrl = pExtra = (PVUSBCTRLEXTRA)pvNew;
+        pExtra->Urb.pVUsb = (PVUSBURBVUSB)&pExtra->Urb.abData[sizeof(pExtra->Urb.abData) + sizeof(VUSBSETUP)];
+        pExtra->Urb.pVUsb->pUrb = &pExtra->Urb;
         pExtra->pMsg = (PVUSBSETUP)pExtra->Urb.abData;
         pExtra->Urb.enmState = VUSBURBSTATE_ALLOCATED;
@@ -696 +699 @@
      * Check that we've got sufficient space in the message URB.
      */
-    if (pExtra->cbMax < cbBuf + pSetupIn->wLength)
-    {
-        uint32_t cbReq = RT_ALIGN_32(cbBuf + pSetupIn->wLength, 1024);
+    if (pExtra->cbMax < cbBuf + pSetupIn->wLength + sizeof(VUSBURBVUSBINT))
+    {
+        uint32_t cbReq = RT_ALIGN_32(cbBuf + pSetupIn->wLength + sizeof(VUSBURBVUSBINT), 1024);
         PVUSBCTRLEXTRA pNew = (PVUSBCTRLEXTRA)RTMemRealloc(pExtra, RT_OFFSETOF(VUSBCTRLEXTRA, Urb.abData[cbReq]));
         if (!pNew)
@@ -711 +714 @@
             pExtra = pNew;
         }
+        pExtra->Urb.pVUsb = (PVUSBURBVUSB)&pExtra->Urb.abData[cbBuf + pSetupIn->wLength];
+        pExtra->Urb.pVUsb->pUrb = &pExtra->Urb;
         pExtra->cbMax = cbReq;
     }