Changeset 83602 in vbox

Timestamp:

Apr 7, 2020 9:26:29 AM (4 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Resolved another @todo: Added ability for guest processes to use argv[0] independently of the actual execution command (follow-up to r136802)). ​​​​bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -1366 +1366 @@
         AssertPtrReturn(pcszArgv0, VERR_INVALID_POINTER); /* Paranoia. */
 
-        const char * const *pcszArgvN = fHasArgv0 && papszArgs + 1 ? papszArgs + 1 : papszArgs;
-        AssertPtrReturn(pcszArgvN, VERR_INVALID_POINTER); /* Ditto. */
-
-        VGSvcVerbose(3, "vgsvcGstCtrlProcessCreateProcess: fHasArgv0=%RTbool, pcszArgv0=%p, pcszArgvN=%p, g_fControlHostFeatures0=%#x\n",
-                     fHasArgv0, pcszArgv0, pcszArgvN, g_fControlHostFeatures0);
+        const uint32_t uArgvIdx = (papszArgs[0] && papszArgs[1]) ? 1 : 0;
+
+        VGSvcVerbose(3, "vgsvcGstCtrlProcessCreateProcess: fHasArgv0=%RTbool, pcszArgv0=%p, uArgvIdx=%RU32, "
+                        "g_fControlHostFeatures0=%#x\n",
+                     fHasArgv0, pcszArgv0, uArgvIdx, g_fControlHostFeatures0);
 
         char **papszArgsExp;
-        rc = vgsvcGstCtrlProcessAllocateArgv(pcszArgv0, pcszArgvN, fFlags, &papszArgsExp);
+        rc = vgsvcGstCtrlProcessAllocateArgv(pcszArgv0, &papszArgs[uArgvIdx], fFlags, &papszArgsExp);
         if (RT_FAILURE(rc))
         {