diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-17 11:18:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-17 11:18:00 (GMT) |
| commit | b1f4ab80a0983f099ba6cf5e690061d36bcc5631 (patch) | |
| tree | e8a7cab2bb6a9d5be7608ec3d52dbbc2936dd308 | |
| parent | 9b4bad2783cd4e6f9fefc8af4ade78391fb0d34e (diff) | |
| parent | 04619d69b837a5ee175520c9e3643ea7c6e879e1 (diff) | |
| download | tcl-b1f4ab80a0983f099ba6cf5e690061d36bcc5631.zip tcl-b1f4ab80a0983f099ba6cf5e690061d36bcc5631.tar.gz tcl-b1f4ab80a0983f099ba6cf5e690061d36bcc5631.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclEnv.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/generic/tclEnv.c b/generic/tclEnv.c index 64d0309..1378708 100644 --- 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++; |