Changeset 56238 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/lib

Timestamp:

Jun 4, 2015 9:46:36 AM (10 years ago)

Author:

vboxsync

Message:

VBoxUSB/win: Fix possible endless loop when bLength is 0 (seen sometimes when a TerraTec Aureon USB soundcard is in a strange state), remove assertion which almost always triggers here with a debug build

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp

@@ -663 +663 @@
     int rc = usbLibDevStrDrEntryGet(hHub, iPort, 0, 0, ppList);
     if (RT_FAILURE(rc))
-    {
-        AssertRC(rc);
         return rc;
-    }
-
-    PUSB_STRING_DESCRIPTOR pLandStrDr = &(*ppList)->StrDr;
-    USHORT *pIdLang = pLandStrDr->bString;
-    ULONG cIdLang = (pLandStrDr->bLength - RT_OFFSETOF(USB_STRING_DESCRIPTOR, bString)) / sizeof (*pIdLang);
+
+    PUSB_STRING_DESCRIPTOR pLangStrDr = &(*ppList)->StrDr;
+    USHORT *pIdLang = pLangStrDr->bString;
+    ULONG cIdLang = (pLangStrDr->bLength - RT_OFFSETOF(USB_STRING_DESCRIPTOR, bString)) / sizeof (*pIdLang);
 
     if (pDevDr->iManufacturer)
@@ -700 +697 @@
             break;
         }
+
+        /* This is invalid but was seen with a TerraTec Aureon 7.1 USB sound card. */
+        if (!pCmnDr->bLength)
+            break;
 
         switch (pCmnDr->bDescriptorType)