Changeset 48742 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp

Timestamp:

Sep 27, 2013 5:05:06 PM (11 years ago)

Author:

vboxsync

Message:

USBFlt: Attempt to fix host crash on Windows when plugging USB device (#6509)

File:

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

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

@@ -326 +326 @@
     VBOXUSBFLT_LOCK_ACQUIRE();
     pDevice = vboxUsbFltDevGetLocked(pPdo);
-    if (pDevice->enmState > VBOXUSBFLT_DEVSTATE_ADDED)
+    if (pDevice == NULL)
+    {
+        WARN(("failed to get device for PDO(0x%p)", pPdo));
+    }
+    else if (pDevice->enmState > VBOXUSBFLT_DEVSTATE_ADDED)
     {
         vboxUsbFltDevRetain(pDevice);
@@ -1364 +1368 @@
     VBOXUSBFLT_LOCK_ACQUIRE();
     pDevice = vboxUsbFltDevGetLocked(pPdo);
-    if (pDevice->enmState = VBOXUSBFLT_DEVSTATE_CAPTURING)
+    if (pDevice == NULL)
+    {
+        WARN(("failed to get device for PDO(0x%p)", pPdo));
+    }
+    else if (pDevice->enmState = VBOXUSBFLT_DEVSTATE_CAPTURING)
     {
         pDevice->enmState = VBOXUSBFLT_DEVSTATE_CAPTURED;