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

Timestamp:

Jun 24, 2020 8:57:02 AM (5 years ago)

Author:

vboxsync

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

138795

Message:

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

File:

• trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp (modified) (1 diff)

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

@@ -2790 +2790 @@
     if (RT_SUCCESS(rc))
     {
-        /*
-         * Create the process.
-         */
-        if (g_fDisplayOutput)
+        char *pszExecResolved = RTPathRealDup(pszExecName);
+        if (pszExecResolved)
         {
-            RTPrintf("txs: Executing \"%s\": ", pszExecName);
-            for (uint32_t i = 0; i < cArgs; i++)
-                RTPrintf(" \"%s\"", papszArgs[i]);
-            RTPrintf("\n");
-        }
-        rc = RTProcCreateEx(pszExecName, papszArgs, pTxsExec->hEnv, 0 /*fFlags*/,
-                            pTxsExec->StdIn.phChild, pTxsExec->StdOut.phChild, pTxsExec->StdErr.phChild,
-                            *pszUsername ? pszUsername : NULL, NULL, NULL,
-                            &pTxsExec->hProcess);
-        if (RT_SUCCESS(rc))
-        {
-            ASMAtomicWriteBool(&pTxsExec->fProcessAlive, true);
-            rc2 = RTThreadUserSignal(pTxsExec->hThreadWaiter); AssertRC(rc2);
-
             /*
-             * Close the child ends of any pipes and redirected files.
+             * Create the process.
              */
-            rc2 = RTHandleClose(pTxsExec->StdIn.phChild);   AssertRC(rc2);
-            pTxsExec->StdIn.phChild     = NULL;
-            rc2 = RTHandleClose(pTxsExec->StdOut.phChild);  AssertRC(rc2);
-            pTxsExec->StdOut.phChild    = NULL;
-            rc2 = RTHandleClose(pTxsExec->StdErr.phChild);  AssertRC(rc2);
-            pTxsExec->StdErr.phChild    = NULL;
-            rc2 = RTPipeClose(pTxsExec->hTestPipeW);        AssertRC(rc2);
-            pTxsExec->hTestPipeW        = NIL_RTPIPE;
-
-            /*
-             * Let another worker function funnel output and input to the
-             * client as well as the process exit code.
-             */
-            rc = txsDoExecHlp2(pTxsExec);
+            if (g_fDisplayOutput)
+            {
+                RTPrintf("txs: Executing \"%s\" -> \"%s\": ", pszExecName, pszExecResolved);
+                for (uint32_t i = 0; i < cArgs; i++)
+                    RTPrintf(" \"%s\"", papszArgs[i]);
+                RTPrintf("\n");
+            }
+
+            rc = RTProcCreateEx(pszExecResolved, papszArgs, pTxsExec->hEnv, 0 /*fFlags*/,
+                                pTxsExec->StdIn.phChild, pTxsExec->StdOut.phChild, pTxsExec->StdErr.phChild,
+                                *pszUsername ? pszUsername : NULL, NULL, NULL,
+                                &pTxsExec->hProcess);
+            if (RT_SUCCESS(rc))
+            {
+                ASMAtomicWriteBool(&pTxsExec->fProcessAlive, true);
+                rc2 = RTThreadUserSignal(pTxsExec->hThreadWaiter); AssertRC(rc2);
+
+                /*
+                 * Close the child ends of any pipes and redirected files.
+                 */
+                rc2 = RTHandleClose(pTxsExec->StdIn.phChild);   AssertRC(rc2);
+                pTxsExec->StdIn.phChild     = NULL;
+                rc2 = RTHandleClose(pTxsExec->StdOut.phChild);  AssertRC(rc2);
+                pTxsExec->StdOut.phChild    = NULL;
+                rc2 = RTHandleClose(pTxsExec->StdErr.phChild);  AssertRC(rc2);
+                pTxsExec->StdErr.phChild    = NULL;
+                rc2 = RTPipeClose(pTxsExec->hTestPipeW);        AssertRC(rc2);
+                pTxsExec->hTestPipeW        = NIL_RTPIPE;
+
+                /*
+                 * Let another worker function funnel output and input to the
+                 * client as well as the process exit code.
+                 */
+                rc = txsDoExecHlp2(pTxsExec);
+            }
+            else
+                rc = txsReplyFailure(pPktHdr, "FAILED  ", "Executing process \"%s\" failed with %Rrc",
+                                     pszExecResolved, rc);
+
+            RTStrFree(pszExecResolved);
         }
         else
-            rc = txsReplyFailure(pPktHdr, "FAILED  ", "Executing process \"%s\" failed with %Rrc",
-                                 pszExecName, rc);
+            rc = VERR_NO_MEMORY;
     }
     else