Changeset 48874 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/mon

Timestamp:

Oct 4, 2013 5:07:40 AM (11 years ago)

Author:

vboxsync

Message:

USBFlt: Another attempt to fix host crash on Windows related to USB (#6509)

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp

@@ -326 +326 @@
     VBOXUSBFLT_LOCK_ACQUIRE();
     pDevice = vboxUsbFltDevGetLocked(pPdo);
+    /*
+     * Prevent a host crash when vboxUsbFltDevGetLocked fails to locate the matching PDO
+     * in g_VBoxUsbFltGlobals.DeviceList (see @bugref{6509}).
+     */
     if (pDevice == NULL)
     {
@@ -1368 +1372 @@
     VBOXUSBFLT_LOCK_ACQUIRE();
     pDevice = vboxUsbFltDevGetLocked(pPdo);
+    /*
+     * Prevent a host crash when vboxUsbFltDevGetLocked fails to locate the matching PDO
+     * in g_VBoxUsbFltGlobals.DeviceList (see @bugref{6509}).
+     */
     if (pDevice == NULL)
     {
@@ -1391 +1399 @@
 {
     PVBOXUSBFLT_DEVICE pDevice = (PVBOXUSBFLT_DEVICE)hDev;
+    /*
+     * Prevent a host crash when VBoxUsbFltProxyStarted fails, returning NULL.
+     * See @bugref{6509}.
+     */
+    if (pDevice == NULL)
+    {
+        WARN(("VBoxUsbFltProxyStopped called with NULL device pointer"));
+        return;
+    }
     VBOXUSBFLT_LOCK_ACQUIRE();
     if (pDevice->enmState == VBOXUSBFLT_DEVSTATE_CAPTURED