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);
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 */