Changeset 46806 in vbox for trunk/src

Timestamp:

Jun 26, 2013 2:24:17 PM (11 years ago)

Author:

vboxsync

Message:

USB: respect the case that vusbDevGetRh() returns NULL

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBDevice.cpp (modified) (2 diffs)
• VUSBReadAhead.cpp (modified) (1 diff)
• VUSBUrb.cpp (modified) (3 diffs)

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

@@ -996 +996 @@
 
     PVUSBROOTHUB pRh = vusbDevGetRh(pDev);
+    AssertPtrReturnVoid(pRh);
     if (pDev->u8Address == VUSB_DEFAULT_ADDRESS)
         pRh->pDefaultAddress = NULL;
@@ -1035 +1036 @@
 {
     PVUSBROOTHUB pRh = vusbDevGetRh(pDev);
+    AssertPtrReturnVoid(pRh);
 
     /*

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

@@ -369 +369 @@
     if (pArgs)
     {
+        PVUSBROOTHUB pRh = vusbDevGetRh(pDev);
         pArgs->pDev  = pDev;
         pArgs->pPipe = pPipe;
         pArgs->fTerminate = false;
-        pArgs->fHighSpeed = ((vusbDevGetRh(pDev)->fHcVersions & VUSB_STDVER_20) != 0);
+        pArgs->fHighSpeed = pRh && ((pRh->fHcVersions & VUSB_STDVER_20) != 0);
         if (pArgs->fHighSpeed)
             rc = RTThreadCreate(&pPipe->ReadAheadThread, vusbDevReadAheadThread, pArgs, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "USBISOC");

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

@@ -990 +990 @@
     PVUSBDEV pDev = pUrb->VUsb.pDev;
     PVUSBROOTHUB pRh = vusbDevGetRh(pDev);
+    AssertPtrReturn(pRh, VERR_VUSB_DEVICE_NOT_ATTACHED);
     LogFlow(("%s: vusbUrbErrorRh: pDev=%p[%s] rh=%p\n", pUrb->pszDesc, pDev, pDev->pUsbIns ? pDev->pUsbIns->pszName : "", pRh));
     return pRh->pIRhPort->pfnXferError(pRh->pIRhPort, pUrb);
@@ -1012 +1013 @@
      */
     PVUSBROOTHUB pRh = vusbDevGetRh(pUrb->VUsb.pDev);
+    AssertPtrReturnVoid(pRh);
     if (pUrb->enmType != VUSBXFERTYPE_MSG)
     {
@@ -1115 +1117 @@
 #ifndef VBOX_WITH_STATISTICS
     PVUSBROOTHUB pRh = vusbDevGetRh(pUrb->VUsb.pDev);
+    AssertPtrReturnVoid(pRh);
 #endif