X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fperllib.c;h=da8e13d965f5c64ba2e80603e61993dd335ca208;hb=73e51c8a2e5bd997f8b13e4f86b01e266a2d73f5;hp=9b488d190f089304f4458a4294d84a0321b0307f;hpb=aa2b96eccca93a6fe7c95af71c0b4a027561512b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/perllib.c b/win32/perllib.c
index 9b488d1..da8e13d 100644
--- a/win32/perllib.c
+++ b/win32/perllib.c
@@ -211,11 +211,12 @@ RunPerl(int argc, char **argv, char **env)
     char szModuleName[MAX_PATH];
     char *arg0 = argv[0];
     char *ansi = NULL;
+    bool use_environ = (env == environ);
 
     osver.dwOSVersionInfoSize = sizeof(osver);
     GetVersionEx(&osver);
 
-    if (osver.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+    if (osver.dwMajorVersion > 4) {
         WCHAR widename[MAX_PATH];
         GetModuleFileNameW(NULL, widename, sizeof(widename)/sizeof(WCHAR));
         argv[0] = ansi = win32_ansipath(widename);
@@ -245,6 +246,16 @@ RunPerl(int argc, char **argv, char **env)
     perl_construct(my_perl);
     PL_perl_destruct_level = 0;
 
+    /* PERL_SYS_INIT() may update the environment, e.g. via ansify_path().
+     * This may reallocate the RTL environment block. Therefore we need
+     * to make sure that `env` continues to have the same value as `environ`
+     * if we have been called this way.  If we have been called with any
+     * other value for `env` then all environment munging by PERL_SYS_INIT()
+     * will be lost again.
+     */
+    if (use_environ)
+        env = environ;
+
     exitstatus = perl_parse(my_perl, xs_init, argc, argv, env);
     if (!exitstatus) {
 #if defined(TOP_CLONE) && defined(USE_ITHREADS)		/* XXXXXX testing */