Changeset 86399 in vbox for trunk

Timestamp:

Oct 1, 2020 7:47:17 PM (4 years ago)

Author:

vboxsync

Message:

tstUsbMouse: Don't leak the CFGM tree for each test instance. bugref:9841

File:

• trunk/src/VBox/Devices/Input/testcase/tstUsbMouse.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Input/testcase/tstUsbMouse.cpp

@@ -140 +140 @@
                 pUsbIns->pHlpR3             = &g_tstUsbHlp;
                 pUsbIns->pvInstanceDataR3   = pUsbIns->achInstanceData;
+                pUsbIns->pCfg               = pCfg;
                 rc = g_UsbHidMou.pfnConstruct(pUsbIns, iInstance, pCfg, NULL);
                 if (RT_SUCCESS(rc))
@@ -156 +157 @@
 
 
+static void tstMouseDestruct(RTTEST hTest, PPDMUSBINS pUsbIns)
+{
+    if (pUsbIns)
+    {
+        g_UsbHidMou.pfnDestruct(pUsbIns);
+        CFGMR3DestroyTree(pUsbIns->pCfg);
+        RTTestGuardedFree(hTest, pUsbIns);
+    }
+}
+
+
 static void testConstructAndDestruct(RTTEST hTest)
 {
@@ -165 +177 @@
     PPDMUSBINS pUsbIns = NULL;
     RTTEST_CHECK_RC(hTest, tstMouseConstruct(hTest, 0, "relative", 1, &pUsbIns), VINF_SUCCESS);
-    if (pUsbIns)
-    {
-        g_UsbHidMou.pfnDestruct(pUsbIns);
-        RTTestGuardedFree(hTest, pUsbIns);
-    }
+    tstMouseDestruct(hTest, pUsbIns);
 
     /*
@@ -205 +213 @@
         RTTEST_CHECK_RC(hTest, tstMouseConstruct(hTest, 0, "relative", 1, &pUsbIns, s_aVersionTests[i].uInsVersion),
                         s_aVersionTests[i].rc);
-        if (pUsbIns)
-            RTTestGuardedFree(hTest, pUsbIns);
+        tstMouseDestruct(hTest, pUsbIns);
     }
     RTAssertSetMayPanic(fSavedMayPanic);
@@ -253 +260 @@
     }
     RTTEST_CHECK_RC_OK(hTest, rc);
-    if (pUsbIns)
-    {
-        g_UsbHidMou.pfnDestruct(pUsbIns);
-        RTTestGuardedFree(hTest, pUsbIns);
-    }
+    tstMouseDestruct(hTest, pUsbIns);
 }
 
@@ -269 +272 @@
     RT_ZERO(Urb);
     if (RT_SUCCESS(rc))
-    {
         rc = g_UsbHidMou.pfnUsbReset(pUsbIns, false);
-    }
     if (RT_SUCCESS(rc))
     {
         if (g_drvTstMouse.pDrv)
-            g_drvTstMouse.pDrv->pfnPutEventAbs(g_drvTstMouse.pDrv, 300, 200, 1,
-                                               3, 3);
+            g_drvTstMouse.pDrv->pfnPutEventAbs(g_drvTstMouse.pDrv, 300, 200, 1, 3, 3);
         else
             rc = VERR_PDM_MISSING_INTERFACE;
@@ -306 +306 @@
     }
     RTTEST_CHECK_RC_OK(hTest, rc);
-    if (pUsbIns)
-    {
-        g_UsbHidMou.pfnDestruct(pUsbIns);
-        RTTestGuardedFree(hTest, pUsbIns);
-    }
+    tstMouseDestruct(hTest, pUsbIns);
 }
 
@@ -360 +356 @@
     }
     RTTEST_CHECK_RC_OK(hTest, rc);
-    if (pUsbIns)
-    {
-        g_UsbHidMou.pfnDestruct(pUsbIns);
-        RTTestGuardedFree(hTest, pUsbIns);
-    }
+    tstMouseDestruct(hTest, pUsbIns);
 }
 #endif