儲存庫 vbox 的更動 50745

時間撮記:

2014-3-12 下午01:10:54 (11 年 以前)

作者:

vboxsync

訊息:

IPRT/process-win: Fixed overwriting of existing environment variables in hEnv block, added a flag to specify mandatory overwriting.

檔案:

• trunk/src/VBox/Runtime/r3/win/process-win.cpp (修改) (5 筆差異)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -613 +613 @@
 
 /**
- * Creates an environment block out of a handed in Unicode and RTENV block.
- * The RTENV block can overwrite entries already present in the Unicode block.
+ * Creates an environment block out of a handed-in Unicode and 
+ * RTENV block. The RTENV block can overwrite entries already 
+ * present in the Unicode block. 
  *
  * @return  IPRT status code.
  *
- * @param   pvBlock         Unicode block (array) of environment entries; name=value
- * @param   hEnv            Handle of an existing RTENV block to use.
- * @param   ppwszBlock      Pointer to the final output.
- */
-static int rtProcWinEnvironmentCreateInternal(VOID *pvBlock, RTENV hEnv, PRTUTF16 *ppwszBlock)
+ * @param   pvEnvBlock          Unicode block (array) of environment entries;
+ *                              in form of "FOO=BAR\0BAR=BAZ".
+ * @param   hEnv                Handle of an existing RTENV block to use. 
+ * @param   fOverwriteExisting  Whether to overwrite existing values of hEnv 
+ *                              with the ones defined in pvEnvBlock. 
+ * @param   ppwszBlock          Pointer to the final output. 
+ */
+static int rtProcWinEnvironmentCreateInternal(VOID *pvEnvBlock, RTENV hEnv,
+                                              bool fOverwriteExisting,
+                                              PRTUTF16 *ppwszBlock)
 {
     RTENV hEnvTemp;
@@ -628 +634 @@
     if (RT_SUCCESS(rc))
     {
-        PCRTUTF16 pwch = (PCRTUTF16)pvBlock;
+        PCRTUTF16 pwch = (PCRTUTF16)pvEnvBlock;
         while (   pwch
                && RT_SUCCESS(rc))
@@ -638 +644 @@
                 if (RT_SUCCESS(rc))
                 {
-                    /* Don't overwrite values which we already have set to a custom value
-                     * specified in hEnv ... */
-                    if (!RTEnvExistEx(hEnv, pszEntry))
-                        rc = RTEnvPutEx(hEnvTemp, pszEntry);
+                    const char *pszEq = strchr(pszEntry, '=');
+                    if (   !pszEq
+                        && fOverwriteExisting)
+                    {
+                        rc = RTEnvUnset(pszEntry);
+                    }
+                    else if (pszEq) 
+                    {
+                        const char *pszValue = pszEq + 1;
+                        size_t cchVar = pszEq - pszEntry;
+                        char *pszVar = (char *)RTMemAlloc(cchVar + 1);
+                        if (pszVar) 
+                        {
+                            memcpy(pszVar, pszEntry, cchVar);
+                            pszVar[cchVar] = '\0';
+                            if (   !RTEnvExistEx(hEnv, pszVar)
+                                || fOverwriteExisting)
+                            {
+                                rc = RTEnvSetEx(hEnvTemp, pszVar, pszValue);
+                            }
+                            RTMemFree(pszVar);
+                        }
+                        else
+                            rc = VERR_NO_MEMORY;
+                    }
                     RTStrFree(pszEntry);
                 }
@@ -694 +721 @@
                 if (pfnCreateEnvironmentBlock(&pvEnvBlockProfile, hToken, FALSE /* Don't inherit from parent. */))
                 {
-                    rc = rtProcWinEnvironmentCreateInternal(pvEnvBlockProfile, hEnv, ppwszBlock);
+                    rc = rtProcWinEnvironmentCreateInternal(pvEnvBlockProfile, hEnv, 
+                                                            false /* fOverwriteExisting */,
+                                                            ppwszBlock);
                     pfnDestroyEnvironmentBlock(pvEnvBlockProfile);
                 }