Changeset 5523 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Oct 26, 2007 5:28:37 PM (18 years ago)

Author:

vboxsync

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

25743

Message:

Main: Fixed memory errors and leaks found by valgrind.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• USBProxyService.cpp (modified) (2 diffs)
• USBProxyService.h (modified) (1 diff)
• USBProxyServiceLinux.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.cpp

@@ -302 +302 @@
 }
 
+/*static*/ void USBProxyService::freeInterfaceMembers (PUSBINTERFACE pIf, unsigned cIfs)
+{
+    while (cIfs-- > 0)
+    {
+        RTMemFree (pIf->paEndpoints);
+        pIf->paEndpoints = NULL;
+        RTStrFree ((char *)pIf->pszDriver);
+        pIf->pszDriver = NULL;
+        RTStrFree ((char *)pIf->pszInterface);
+        pIf->pszInterface = NULL;
+
+        freeInterfaceMembers(pIf->paAlts, pIf->cAlts);
+        RTMemFree(pIf->paAlts);
+        pIf->paAlts = NULL;
+        pIf->cAlts = 0;
+
+        /* next */
+        pIf++;
+    }
+}
 
 /*static*/ void USBProxyService::freeDevice (PUSBDEVICE pDevice)
@@ -309 +329 @@
     while (cCfgs-- > 0)
     {
-        PUSBINTERFACE pIf = pCfg->paInterfaces;
-        unsigned cIfs = pCfg->bNumInterfaces;
-        while (cIfs-- > 0)
-        {
-            RTMemFree (pIf->paEndpoints);
-            pIf->paEndpoints = NULL;
-            RTStrFree ((char *)pIf->pszDriver);
-            pIf->pszDriver = NULL;
-            RTStrFree ((char *)pIf->pszInterface);
-            pIf->pszInterface = NULL;
-            /* next */
-            pIf++;
-        }
+        freeInterfaceMembers (pCfg->paInterfaces, pCfg->bNumInterfaces);
         RTMemFree (pCfg->paInterfaces);
         pCfg->paInterfaces = NULL;
+        pCfg->bNumInterfaces = 0;
+
         RTStrFree ((char *)pCfg->pszConfiguration);
         pCfg->pszConfiguration = NULL;

trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.h

@@ -136 +136 @@
 
 public:
+    /**
+     * Free all the members of a USB interface returned by getDevice().
+     *
+     * @param   pIf         Pointer to the interface.
+     * @param   cIfs        Number of consecutive interfaces pIf points to
+     */
+    static void freeInterfaceMembers (PUSBINTERFACE pIf, unsigned cIfs);
+
     /**
      * Free one USB device returned by getDevice().

trunk/src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp

@@ -840 +840 @@
                 {
                     USBINTERFACE If = {0};
+                    bool fIfAdopted = false;
                     while (*psz && VBOX_SUCCESS (rc))
                     {
@@ -883 +884 @@
                                     Assert (!If.bInterfaceNumber); Assert (!If.bAlternateSetting);
                                     *pIf = If;
+                                    fIfAdopted = true;
                                 }
                                 else
@@ -895 +897 @@
                                 pIf = &pCfg->paInterfaces[If.bInterfaceNumber];
                                 if (!If.bAlternateSetting)
+                                {
+                                    freeInterfaceMembers (pIf, 1);
                                     *pIf = If;
+                                    fIfAdopted = true;
+                                }
                                 else
                                 {
@@ -902 +908 @@
                                     {
                                         pIf->paAlts = paAlts;
-                                        pIf = &paAlts[pIf->cAlts++];
+                                        // don't do pIf = &paAlts[pIf->cAlts++]; as it will increment after the assignment
+                                        unsigned cAlts = pIf->cAlts++;
+                                        pIf = &paAlts[cAlts];
                                         *pIf = If;
+                                        fIfAdopted = true;
                                     }
                                     else
@@ -916 +925 @@
                         }
                     }
+
+                    if (!fIfAdopted)
+                        freeInterfaceMembers (&If, 1);
 
                     /* start anew with endpoints. */