Changeset 92667 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Dec 1, 2021 3:14:05 AM (3 years ago)

Author:

vboxsync

Message:

VBoxService: Added missing error handling for UPN formatting in vgsvcGstCtrlProcessCreateProcess.

File:

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

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

@@ -1425 +1425 @@
             VGSvcVerbose(3, "Starting process '%s' ...\n", szExecExp);
 
-            const char *pszUser = pszAsUser;
 #ifdef RT_OS_WINDOWS
             /* If a domain name is given, construct an UPN (User Principle Name) with
              * the domain name built-in, e.g. "[email protected]". */
             char *pszUserUPN = NULL;
-            if (   pszDomain
-                && *pszDomain != '\0')
-            {
-                int cbUserUPN = RTStrAPrintf(&pszUserUPN, "%s@%s", pszAsUser, pszDomain);
-                if (cbUserUPN > 0)
-                {
-                    pszUser = pszUserUPN;
-                    VGSvcVerbose(3, "Using UPN: %s\n", pszUserUPN);
-                }
-            }
-#endif
-
-            /* Do normal execution. */
-            rc = RTProcCreateEx(szExecExp, papszArgsExp, hEnv, fProcCreateFlags,
-                                phStdIn, phStdOut, phStdErr,
-                                pszUser,
-                                pszPassword && *pszPassword ? pszPassword : NULL,
-                                NULL /*pvExtraData*/,
-                                phProcess);
+            if (pszDomain && *pszDomain != '\0')
+            {
+                pszUserUPN = pszAsUser = RTStrAPrintf2("%s@%s", pszAsUser, pszDomain);
+                if (pszAsUser)
+                    VGSvcVerbose(3, "Using UPN: %s\n", pszAsUser);
+                else
+                    rc = VERR_NO_STR_MEMORY;
+            }
+            if (RT_SUCCESS(rc))
+#endif
+            {
+                /* Do normal execution. */
+                rc = RTProcCreateEx(szExecExp, papszArgsExp, hEnv, fProcCreateFlags,
+                                    phStdIn, phStdOut, phStdErr,
+                                    pszAsUser,
+                                    pszPassword && *pszPassword ? pszPassword : NULL,
+                                    NULL /*pvExtraData*/,
+                                    phProcess);
+
 #ifdef RT_OS_WINDOWS
-            if (pszUserUPN)
                 RTStrFree(pszUserUPN);
 #endif
-            VGSvcVerbose(3, "Starting process '%s' returned rc=%Rrc\n", szExecExp, rc);
-
+                VGSvcVerbose(3, "Starting process '%s' returned rc=%Rrc\n", szExecExp, rc);
+            }
             vgsvcGstCtrlProcessFreeArgv(papszArgsExp);
         }