Merge 8.6

tcltk · Jul 17, 2021 · 379f893 · 379f893
2 parents 5ef4e9a + 9737054
commit 379f893
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
@@ -420,6 +420,16 @@ Tcl_PutEnv(
 
     if ((value != NULL) && (value != name)) {
 	value[0] = '\0';
+#if defined(_WIN32)
+	if (tenviron == NULL) {
+	    /*
+	     * When we are started from main(), the _wenviron array could
+	     * be NULL and will be initialized by the first _wgetenv() call.
+	     */
+
+	(void) _wgetenv(L"WINDIR");
+	}
+#endif
 	TclSetEnv(name, value+1);
     }
     TclEnvEpoch++;