Changeset 70694 in vbox for trunk/src/VBox/Devices/USB/VUSBDevice.cpp

Timestamp:

Jan 22, 2018 9:41:08 PM (7 years ago)

Author:

vboxsync

Message:

VUSBDevice: Fix for leaving the critical section in the error case where it wouldn't get unlocked

File:

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

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

@@ -313 +313 @@
                                          pDev->pUsbIns, pNewCfgDesc->Core.bConfigurationValue,
                                          pDev->pCurCfgDesc, pDev->paIfStates, pNewCfgDesc);
+        RTCritSectLeave(&pDev->pHub->pRootHub->CritSectDevices);
         if (RT_FAILURE(rc))
         {
@@ -318 +319 @@
             return false;
         }
-        RTCritSectLeave(&pDev->pHub->pRootHub->CritSectDevices);
     }
     Log(("vusb: %p[%s]: SET_CONFIGURATION: Selected config %u\n", pDev, pDev->pUsbIns->pszName, iCfg));
@@ -461 +461 @@
         RTCritSectEnter(&pDev->pHub->pRootHub->CritSectDevices);
         int rc = vusbDevIoThreadExecSync(pDev, (PFNRT)pDev->pUsbIns->pReg->pfnUsbSetInterface, 3, pDev->pUsbIns, iIf, iAlt);
+        RTCritSectLeave(&pDev->pHub->pRootHub->CritSectDevices);
         if (RT_FAILURE(rc))
         {
@@ -466 +467 @@
             return false;
         }
-        RTCritSectLeave(&pDev->pHub->pRootHub->CritSectDevices);
     }