Changeset 89460 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Jun 2, 2021 9:50:28 AM (4 years ago)

Author:

vboxsync

Message:

ValKit/AudioTest: You do not need to RTStrDup ValueUnion.psz, the string will be there till we return. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (7 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -1640 +1640 @@
      * Parse options and process arguments.
      */
-    char     *pszSetA = NULL;
-    char     *pszSetB = NULL;
-    unsigned iTestSet = 0;
+    const char *apszSets[2] = { NULL, NULL };
+    unsigned    iTestSet    = 0;
 
     int           rc;
@@ -1654 +1653 @@
 
             case VINF_GETOPT_NOT_OPTION:
-            {
-                char **ppszSet = iTestSet == 0 ? &pszSetA : &pszSetB;
-
                 if (iTestSet == 0)
                     RTTestBanner(g_hTest);
-
-                *ppszSet = RTStrDup(ValueUnion.psz);
-                AssertPtrReturn(*ppszSet, RTEXITCODE_FAILURE);
-
-                iTestSet++;
-                break;
-            }
+                if (iTestSet >= RT_ELEMENTS(apszSets))
+                    return RTMsgErrorExitFailure("Only two test sets can be verified at one time");
+                apszSets[iTestSet++] = ValueUnion.psz;
+                break;
 
             AUDIO_TEST_COMMON_OPTION_CASES(ValueUnion);
@@ -1676 +1669 @@
     if (!iTestSet)
         return RTMsgErrorExitFailure("At least one test set must be specified");
-
-    if (iTestSet > 2)
-        return RTMsgErrorExitFailure("Only two test sets can be verified at one time");
 
     /*
@@ -1684 +1674 @@
      * for test set B.
      */
+    char szDirCur[RTPATH_MAX];
     if (iTestSet == 1)
     {
-        char szDirCur[RTPATH_MAX];
         rc = RTPathGetCurrent(szDirCur, sizeof(szDirCur));
         if (RT_SUCCESS(rc))
-        {
-            Assert(pszSetB == NULL);
-            pszSetB = RTStrDup(szDirCur);
-            AssertPtrReturn(pszSetB, RTEXITCODE_FAILURE);
-        }
+            apszSets[1] = szDirCur;
         else
             RTTestFailed(g_hTest, "Failed to retrieve current directory: %Rrc", rc);
@@ -1699 +1685 @@
 
     if (RT_SUCCESS(rc))
-        rc = audioVerifyOne(pszSetA, pszSetB);
-
-    RTStrFree(pszSetA);
-    RTStrFree(pszSetB);
+        audioVerifyOne(apszSets[0], apszSets[1]);
 
     /*
@@ -2273 +2256 @@
         {
             case VKAT_SELFTEST_OPT_ATS_HOST:
-                pszAtsAddr = RTStrDup(ValueUnion.psz);
+                pszAtsAddr = ValueUnion.psz;
                 break;
 
@@ -2294 +2277 @@
 
     audioTestDoSelftest(pDrvReg, pszAtsAddr);
-
-    RTStrFree(pszAtsAddr);
 
     /*