Merge 8.6

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/encoding.test b/tests/encoding.test
index ccc32da..e313a29 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -391,7 +391,12 @@ test encoding-15.15 {UtfToUtfProc low surrogate character output} {
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {1 3 eda882}
-test encoding-15.16 {UtfToUtfProc emoji character output} {
+test encoding-15.16 {UtfToUtfProc: Invalid 4-byte UTF-8, see [ed29806ba]} {
+    set x \xF0\xA0\xA1\xC2
+    set y [encoding convertfrom utf-8 \xF0\xA0\xA1\xC2]
+    list [string length $x] $y
+} "4 \xF0\xA0\xA1\xC2"
+test encoding-15.17 {UtfToUtfProc emoji character output} {
     set x \U1F602
     set y [encoding convertto utf-8 \U1F602]
     binary scan $y H* z