Protect additional Tcl_UtfToUniChar() call, for the case when not enough bytes are available in the buffer any more.

Add additional test-cases for those situations (upper surrogate followed by somthing other than lower surrogate)

1 files changed, 21 insertions, 3 deletions

diff --git a/tests/encoding.test b/tests/encoding.test
index cf27190..36fcff6 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -339,11 +339,29 @@ test encoding-15.5 {UtfToUtfProc emoji character input} {
     list [string length $x] [string length $y] $y
 } "4 2 \uD83D\uDE02"
 test encoding-15.6 {UtfToUtfProc emoji character output} {
-    set x \uD83D\uDE02
-    set y [encoding convertto utf-8 \uD83D\uDE02]
+    set x \uDE02\uD83D\uDE02\uD83D
+    set y [encoding convertto utf-8 \uDE02\uD83D\uDE02\uD83D]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
-} {2 4 f09f9882}
+} {4 10 edb882f09f9882eda0bd}
+test encoding-15.7 {UtfToUtfProc emoji character output} {
+    set x \uDE02\uD83D\uD83D
+    set y [encoding convertto utf-8 \uDE02\uD83D\uD83D]
+    binary scan $y H* z
+    list [string length $x] [string length $y] $z
+} {3 9 edb882eda0bdeda0bd}
+test encoding-15.8 {UtfToUtfProc emoji character output} {
+    set x \uDE02\uD83D\xE9
+    set y [encoding convertto utf-8 \uDE02\uD83D\xE9]
+    binary scan $y H* z
+    list [string length $x] [string length $y] $z
+} {3 8 edb882eda0bdc3a9}
+test encoding-15.9 {UtfToUtfProc emoji character output} {
+    set x \uDE02\uD83DX
+    set y [encoding convertto utf-8 \uDE02\uD83DX]
+    binary scan $y H* z
+    list [string length $x] [string length $y] $z
+} {3 7 edb882eda0bd58}
 
 test encoding-16.1 {UnicodeToUtfProc} {
     set val [encoding convertfrom unicode NN]