Changeset 60712 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2016 8:01:06 AM (9 years ago)

Author:

vboxsync

Message:

Main/HostUSBDevice: Fix crash on Windows if the USB/IP backend is enabled, the hub name is only available for devices attached directly to the host

File:

• trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp

@@ -1052 +1052 @@
     /* The hub/bus + port should help a lot in a re-attach situation. */
 #ifdef RT_OS_WINDOWS
-    iDiff = strcmp(aDev1->pszHubName, aDev2->pszHubName);
-    if (iDiff)
-    {
-        //Log3(("compare: HubName: %s != %s\n", aDev1->pszHubName, aDev2->pszHubName));
-        return iDiff;
+    /* The hub name makes only sense for the host backend. */
+    if (   !strcmp(aDev1->pszBackend, "host")
+        && aDev1->pszHubName
+        && aDev2->pszHubName)
+    {
+        iDiff = strcmp(aDev1->pszHubName, aDev2->pszHubName);
+        if (iDiff)
+        {
+            //Log3(("compare: HubName: %s != %s\n", aDev1->pszHubName, aDev2->pszHubName));
+            return iDiff;
+        }
     }
 #else