Changeset 92663 in vbox for trunk/src/VBox

Timestamp:

Dec 1, 2021 2:55:35 AM (3 years ago)

Author:

vboxsync

Message:

VBoxService: Restrict the argv[0] quoting hack to windows in vgsvcGstCtrlProcessAllocateArgv.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (3 diffs)

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

@@ -1049 +1049 @@
     AssertPtrReturn(pszArgv0,   VERR_INVALID_POINTER);
     AssertPtrReturn(ppapszArgv, VERR_INVALID_POINTER);
+    AssertReturn(!(fFlags & EXECUTEPROCESSFLAG_EXPAND_ARGUMENTS), VERR_INVALID_FLAGS); /** @todo implement me */
 
 #ifndef VBOXSERVICE_ARG1_UTF8_ARGV
@@ -1078 +1079 @@
 #endif
 
-    /* HACK ALERT! Older hosts (< VBox 6.1.x) did not allow the user to really specify the first
-                   argument separately from the executable image, so we have to fudge
-                   a little in the unquoted argument case to deal with executables
-                   containing spaces. */
-    /** @todo r=bird: WTF!?? This makes absolutely no sense on non-windows.  An
-     * on windows the first flag test must be inverted, as it's when RTProcCreateEx
-     * doesn't do any quoting that we have to do it here, isn't it?
-     * Aaaaaaaaaaaaaaaaaaarrrrrrrrrrrrrrrrrrrrrrrrrrgggggggggggggggggggggggg! */
-    if (   !(fFlags & EXECUTEPROCESSFLAG_UNQUOTED_ARGS)
-        || !strpbrk(pszArgv0, " \t\n\r")
-        || pszArgv0[0] == '"')
-    {
-        rc = RTStrDupEx(&papszNewArgv[0], pszArgv0);
-    }
-    else
+    /* HACK ALERT! Older hosts (< VBox 6.1.x) did not allow the user to really specify
+                   the first argument separately from the executable image, so we have
+                   to fudge a little in the unquoted argument case to deal with executables
+                   containing spaces.  Windows only, as RTPROC_FLAGS_UNQUOTED_ARGS is
+                   ignored on all other hosts. */
+#ifdef RT_OS_WINDOWS
+    if (   (fFlags & EXECUTEPROCESSFLAG_UNQUOTED_ARGS)
+        && strpbrk(pszArgv0, " \t\n\r")
+        && pszArgv0[0] == '"')
     {
         size_t cchArgv0 = strlen(pszArgv0);
@@ -1107 +1102 @@
         }
     }
-
+    else
+#endif
+        rc = RTStrDupEx(&papszNewArgv[0], pszArgv0);
     if (RT_SUCCESS(rc))
     {