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

Timestamp:

Jun 24, 2020 9:40:54 AM (5 years ago)

Author:

vboxsync

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

138796

Message:

Validation Kit/TXS: Resolve executables for EXEC command before feeding into into RTProcCreateEx(), more verbose version.

File:

• trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp (modified) (4 diffs)

trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp

@@ -2790 +2790 @@
     if (RT_SUCCESS(rc))
     {
-        char *pszExecResolved = RTPathRealDup(pszExecName);
-        if (pszExecResolved)
+        char szPathResolved[RTPATH_MAX + 1];
+        rc = RTPathReal(pszExecName, szPathResolved, sizeof(szPathResolved));
+        if (RT_SUCCESS(rc))
         {
             /*
@@ -2798 +2799 @@
             if (g_fDisplayOutput)
             {
-                RTPrintf("txs: Executing \"%s\" -> \"%s\": ", pszExecName, pszExecResolved);
+                RTPrintf("txs: Executing \"%s\" -> \"%s\": ", pszExecName, szPathResolved);
                 for (uint32_t i = 0; i < cArgs; i++)
                     RTPrintf(" \"%s\"", papszArgs[i]);
@@ -2804 +2805 @@
             }
 
-            rc = RTProcCreateEx(pszExecResolved, papszArgs, pTxsExec->hEnv, 0 /*fFlags*/,
+            rc = RTProcCreateEx(szPathResolved, papszArgs, pTxsExec->hEnv, 0 /*fFlags*/,
                                 pTxsExec->StdIn.phChild, pTxsExec->StdOut.phChild, pTxsExec->StdErr.phChild,
                                 *pszUsername ? pszUsername : NULL, NULL, NULL,
@@ -2831 +2832 @@
                 rc = txsDoExecHlp2(pTxsExec);
             }
-            else
-                rc = txsReplyFailure(pPktHdr, "FAILED  ", "Executing process \"%s\" failed with %Rrc",
-                                     pszExecResolved, rc);
-
-            RTStrFree(pszExecResolved);
         }
-        else
-            rc = VERR_NO_MEMORY;
+
+        if (RT_FAILURE(rc))
+           rc = txsReplyFailure(pPktHdr, "FAILED  ", "Executing process \"%s\" failed with %Rrc",
+                                pszExecName, rc);
     }
     else