merge main working branch

1 files changed, 27 insertions, 4 deletions

diff --git a/tests/env.test b/tests/env.test
index 9010f52..83d99e0 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -70,7 +70,7 @@ set printenvScript [makeFile {
     }
     proc mangle s {
 	regsub -all {\[|\\|\]} $s {\\&} s
-	regsub -all {[\u0000-\u001f\u007f-\uffff]} $s {[manglechar &]} s
+	regsub -all "\[\u0000-\u001f\u007f-\uffff\]" $s {[manglechar &]} s
 	return [subst -novariables $s]
     }
     proc manglechar c {
@@ -89,7 +89,7 @@ set printenvScript [makeFile {
 	SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
 	DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
 	__CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM
-	CommonProgramFiles ProgramFiles
+	CommonProgramFiles ProgramFiles CommonProgramW6432 ProgramW6432
     } {
 	lrem names $name
     }
@@ -121,7 +121,7 @@ foreach name [array names env] {
 	SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
 	DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
 	SECURITYSESSIONID LANG WINDIR TERM
-	CommonProgramFiles ProgramFiles
+	CONNOMPROGRAMFILES PROGRAMFILES COMMONPROGRAMW6432 PROGRAMW6432
     }} {
 	unset env($name)
     }
@@ -218,8 +218,8 @@ test env-4.5 {unsetting international environment variables} -setup {
     unset env(\ua7)
     getenv
 } -constraints {exec} -cleanup {
-    encoding system $sysenc
     unset env(\ub6)
+    encoding system $sysenc
 } -result {\u00b6=\u00a7}
 
 test env-5.0 {corner cases - set a value, it should exist} -body {
@@ -291,6 +291,29 @@ test env-6.1 {corner cases - add lots of env variables} {} {
     expr {[array size env] - $size}
 } 100
 
+test env-7.1 {[219226]: whole env array should not be unset by read} {
+    set n [array size env]
+    set s [array startsearch env]
+    while {[array anymore env $s]} {
+	array nextelement env $s
+	incr n -1
+    }
+    array donesearch env $s
+    return $n
+} 0
+test env-7.2 {[219226]: links to env elements should not be removed by read} {
+    apply {{} {
+	set ::env(test7_2) ok
+	upvar env(test7_2) elem
+	set ::env(PATH)
+	try {
+	    return $elem
+	} finally {
+	    unset ::env(test7_2)
+	}
+    }}
+} ok
+
 # Restore the environment variables at the end of the test.
 
 foreach name [array names env] {