Changeset 60156 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Mar 23, 2016 11:44:24 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106175

Message:

USB: Purge strings.

File:

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

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

@@ -314 +314 @@
     for (; pDrList; pDrList = pDrList->pNext)
     {
-        char ** lppszString = NULL;
-        if (pConInfo->DeviceDescriptor.iManufacturer && pDrList->iDr == pConInfo->DeviceDescriptor.iManufacturer)
-        {
-            lppszString = (char**)&pDev->pszManufacturer;
-        }
-        else if (pConInfo->DeviceDescriptor.iProduct && pDrList->iDr == pConInfo->DeviceDescriptor.iProduct)
-        {
-            lppszString = (char**)&pDev->pszProduct;
-        }
-        else if (pConInfo->DeviceDescriptor.iSerialNumber && pDrList->iDr == pConInfo->DeviceDescriptor.iSerialNumber)
-        {
-            lppszString = (char**)&pDev->pszSerialNumber;
-        }
-
-        if (lppszString)
-        {
-/** @todo r=bird: This code is making bad asumptions that strings are sane and
- *  that stuff succeeds:
- *  http://vbox.innotek.de/pipermail/vbox-dev/2011-August/004516.html
- *
- *  */
-            rc = RTUtf16ToUtf8((PCRTUTF16)pDrList->StrDr.bString, lppszString);
-            if (RT_FAILURE(rc))
+        char **ppszString = NULL;
+        if (   pConInfo->DeviceDescriptor.iManufacturer
+            && pDrList->iDr == pConInfo->DeviceDescriptor.iManufacturer)
+            ppszString = (char **)&pDev->pszManufacturer;
+        else if (   pConInfo->DeviceDescriptor.iProduct
+                 && pDrList->iDr == pConInfo->DeviceDescriptor.iProduct)
+            ppszString = (char **)&pDev->pszProduct;
+        else if (   pConInfo->DeviceDescriptor.iSerialNumber
+                 && pDrList->iDr == pConInfo->DeviceDescriptor.iSerialNumber)
+            ppszString = (char **)&pDev->pszSerialNumber;
+        if (ppszString)
+        {
+            rc = RTUtf16ToUtf8((PCRTUTF16)pDrList->StrDr.bString, ppszString);
+            if (RT_SUCCESS(rc))
+            {
+                Assert(*ppszString);
+                USBLibPurgeEncoding(ppszString);
+
+                if (pDrList->iDr == pConInfo->DeviceDescriptor.iSerialNumber)
+                    pDev->u64SerialHash = USBLibHashSerial(pDev->pszSerialNumber);
+            }
+            else
             {
                 AssertMsgFailed(("RTUtf16ToUtf8 failed, rc (%d), resuming\n", rc));
-                continue;
-            }
-
-            Assert(lppszString);
-            if (pDrList->iDr == pConInfo->DeviceDescriptor.iSerialNumber)
-            {
-                pDev->u64SerialHash = USBLibHashSerial(pDev->pszSerialNumber);
+                *ppszString = NULL;
             }
         }