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

Timestamp:

Dec 14, 2015 3:56:07 PM (9 years ago)

Author:

vboxsync

Message:

VBoxUSB/win: Minor cleanups and a few more pointer checks after vital memory allocations

File:

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

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

@@ -131 +131 @@
         }
 
-        if (version.u32Major != USBDRV_MAJOR_VERSION
-                || version.u32Minor <  USBDRV_MINOR_VERSION)
+        if (   version.u32Major != USBDRV_MAJOR_VERSION
+            || version.u32Minor <  USBDRV_MINOR_VERSION)
         {
             AssertMsgFailed(("Invalid version %d:%d vs %d:%d\n", version.u32Major, version.u32Minor, USBDRV_MAJOR_VERSION, USBDRV_MINOR_VERSION));
@@ -280 +280 @@
 
     return VINF_SUCCESS;
-}
-
-static void usbLibDevFree(PUSBDEVICE pDevice)
-{
-    RTStrFree((char*)pDevice->pszAddress);
-    RTStrFree((char*)pDevice->pszHubName);
-    if (pDevice->pszManufacturer)
-        RTStrFree((char*)pDevice->pszManufacturer);
-    if (pDevice->pszProduct)
-        RTStrFree((char*)pDevice->pszProduct);
-    if (pDevice->pszSerialNumber)
-        RTStrFree((char*)pDevice->pszSerialNumber);
-    RTMemFree(pDevice);
-}
-
-static void usbLibDevFreeList(PUSBDEVICE pDevice)
-{
-    while (pDevice)
-    {
-        PUSBDEVICE pNext = pDevice->pNext;
-        usbLibDevFree(pDevice);
-        pDevice = pNext;
-    }
 }
 
@@ -322 +299 @@
         pDev->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;
     pDev->enmSpeed = USBDEVICESPEED_UNKNOWN;
-    pDev->pszAddress = RTStrDup(lpszDrvKeyName);
+    int rc = RTStrAPrintf((char **)&pDev->pszAddress, "%s", lpszDrvKeyName);
+    if (RT_FAILURE(rc))
+        return rc;
+    pDev->pszBackend = RTStrDup("host");
+    if (!pDev->pszBackend)
+    {
+        RTStrFree((char *)pDev->pszAddress);
+        return VERR_NO_STR_MEMORY;
+    }
     pDev->pszHubName = RTStrDup(lpszHubName);
     pDev->bNumConfigurations = 0;
     pDev->u64SerialHash = 0;
-    pDev->pszBackend = RTStrDup("host");
 
     for (; pDrList; pDrList = pDrList->pNext)
@@ -351 +335 @@
  *
  *  */
-            int rc = RTUtf16ToUtf8((PCRTUTF16)pDrList->StrDr.bString, lppszString);
+            rc = RTUtf16ToUtf8((PCRTUTF16)pDrList->StrDr.bString, lppszString);
             if (RT_FAILURE(rc))
             {
@@ -811 +795 @@
 
     PUSBDEVICE pDev = (PUSBDEVICE)RTMemAllocZ(sizeof (*pDev));
-    rc = usbLibDevPopulate(pDev, pConInfo, iPort, lpszName, lpcszHubName, pList);
-    AssertRC(rc);
-    if (RT_SUCCESS(rc))
-    {
-        pDev->pNext = *ppDevs;
-        *ppDevs = pDev;
-        ++*pcDevs;
-    }
+    if (RT_LIKELY(pDev))
+    {
+        rc = usbLibDevPopulate(pDev, pConInfo, iPort, lpszName, lpcszHubName, pList);
+        if (RT_SUCCESS(rc))
+        {
+            pDev->pNext = *ppDevs;
+            *ppDevs = pDev;
+            ++*pcDevs;
+        }
+        else
+            RTMemFree(pDev);
+    }
+    else
+        rc = VERR_NO_MEMORY;
 
     if (pCfgDr)
@@ -830 +820 @@
         usbLibDevStrDrEntryFreeList(pList);
 
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -870 +860 @@
         for (ULONG i = 1; i <= NodeInfo.u.HubInformation.HubDescriptor.bNumberOfPorts; ++i)
         {
+            /* Just skip devices for which we failed to create the device structure. */
             usbLibDevGetHubPortDevices(hDev, lpszName, i, ppDevs, pcDevs);
         }
@@ -1010 +1001 @@
             {
                 /* dbg breakpoint */
-                Assert(0);
+                AssertFailed();
             }
 #endif
@@ -1261 +1252 @@
 
     /*
-     * Register the Window Class and the hitten window create.
+     * Register the Window Class and create the hidden window.
      */
     WNDCLASS wc;
@@ -1467 +1458 @@
                                      * We're DONE!
                                      *
-                                     * Juse ensure that the event is set so the
+                                     * Just ensure that the event is set so the
                                      * first "wait change" request is processed.
                                      */