Merge 8.7

2 files changed, 17 insertions, 2 deletions

diff --git a/tests/chanio.test b/tests/chanio.test
index e8bcc5e..2d26ac9 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -5514,7 +5514,7 @@ test chan-io-41.5 {Tcl_FileeventCmd: errors} -constraints fileevent -body {
 test chan-io-41.6 {Tcl_FileeventCmd: directory} -constraints {fileevent unix} -setup {
     set tempdir [::tcltests::tempdir]
 } -body {
-    set chan [open $tempdir] 
+    set chan [open $tempdir]
     chan event $chan readable [list ::apply [list {} {
 	variable success
 	set success 1
@@ -5551,7 +5551,7 @@ test chan-io-41.8 {Tcl_FileeventCmd: symbolic link} -constraints {fileevent unix
 } -body {
     set target [makeFile {not again} thefile $tempdir]
     set link [file join $tempdir thelin]
-    file link -symbolic $link $target 
+    file link -symbolic $link $target
     set chan [open $link]
     chan event $chan readable [list ::apply [list {} {
 	variable success
diff --git a/tests/encoding.test b/tests/encoding.test
index ed37928..ecc439d 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -429,6 +429,21 @@ test encoding-15.21 {UtfToUtfProc CESU-8 noncharacter} {
     binary scan $y H* z
     list [string length $y] $z
 } {3 efbfbf}
+test encoding-15.22 {UtfToUtfProc CESU-8 bug [048dd20b4171c8da]} {
+    set y [encoding convertto cesu-8 \x80]
+    binary scan $y H* z
+    list [string length $y] $z
+} {2 c280}
+test encoding-15.23 {UtfToUtfProc CESU-8 bug [048dd20b4171c8da]} {
+    set y [encoding convertto cesu-8 \u100]
+    binary scan $y H* z
+    list [string length $y] $z
+} {2 c480}
+test encoding-15.24 {UtfToUtfProc CESU-8 bug [048dd20b4171c8da]} {
+    set y [encoding convertto cesu-8 \u3FF]
+    binary scan $y H* z
+    list [string length $y] $z
+} {2 cfbf}
 
 test encoding-16.1 {Utf16ToUtfProc} -body {
     set val [encoding convertfrom utf-16 NN]