Changeset 37135 in vbox

Timestamp:

May 18, 2011 2:44:47 PM (14 years ago)

Author:

vboxsync

Message:

dev/usb/win: race fix

File:

• trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp (modified) (1 diff)

trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp

@@ -617 +617 @@
      */
     PVUSBURB pUrb = NULL;
-    unsigned cQueuedUrbs = pPriv->cQueuedUrbs;
+    unsigned cQueuedUrbs;
+    /* we must get the queued urb count inside a lock
+     * otherwise we may end up in a situation when cQueuedUrbs is incremented
+     * by the usbProxyWinAsyncIoThread, but the pPriv->paHandles[cQueuedUrbs-1]
+     * is still invalid */
+    RTCritSectEnter(&pPriv->CritSect);
+    cQueuedUrbs = pPriv->cQueuedUrbs;
+    RTCritSectLeave(&pPriv->CritSect);
+
     DWORD rc = WaitForMultipleObjects(cQueuedUrbs, pPriv->paHandles, FALSE, cMillies);
     if (rc >= WAIT_OBJECT_0 && rc < WAIT_OBJECT_0 + cQueuedUrbs)