Changeset 57824 in vbox for trunk

Timestamp:

Sep 18, 2015 10:30:06 AM (9 years ago)

Author:

vboxsync

Message:

IPRT/process-win.cpp: Also clone the handed-in environment block.

File:

• trunk/src/VBox/Runtime/r3/win/process-win.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -670 +670 @@
         return;
 
-    if (fFlags & RTPROC_MODIFY_DEFAULT_ENV)
-    {
-        RTEnvDestroy(*phEnv);
-        RTMemFree(phEnv);
-    }
+    RTEnvDestroy(*phEnv);
+    RTMemFree(phEnv);
 }
 
@@ -991 +988 @@
 static int rtProcWinCreateEnvFromToken(HANDLE hToken, RTENV hEnv, uint32_t fFlags, PRTENV *pphEnv)
 {
+    PRTENV phEnv = (PRTENV)RTMemAlloc(sizeof(RTENV));
+    if (!phEnv)
+        return VERR_NO_MEMORY;
+
     int rc = VINF_SUCCESS;
-
-    PRTENV phEnv;
     if (fFlags & RTPROC_MODIFY_DEFAULT_ENV)
     {
-        phEnv = (PRTENV)RTMemAlloc(sizeof(RTENV));
-        if (!phEnv)
-            rc = VERR_NO_MEMORY;
-
-        if (RT_SUCCESS(rc))
-        {
-            if (fFlags & RTPROC_FLAGS_PROFILE)
-            {
-                rc = RTEnvCreate(phEnv);
-                if (RT_SUCCESS(rc))
-                    rc = rtProcWinRetrieveEnvFromToken(hToken, *phEnv);
-            }
-            else
-                rc = RTEnvClone(phEnv, RTENV_DEFAULT);
-        }
+        if (fFlags & RTPROC_FLAGS_PROFILE)
+        {
+            rc = RTEnvCreate(phEnv);
+            if (RT_SUCCESS(rc))
+                rc = rtProcWinRetrieveEnvFromToken(hToken, *phEnv);
+        }
+        else
+            rc = RTEnvClone(phEnv, RTENV_DEFAULT);
 
         if (   RT_SUCCESS(rc)
@@ -1021 +1013 @@
     }
     else /* Only use the environment block handed-in. */
-        phEnv = &hEnv;
+        rc = RTEnvClone(phEnv, hEnv);
 
     if (RT_SUCCESS(rc))