summaryrefslogtreecommitdiffstats
path: root/generic/tclStubInit.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-03-02 16:08:40 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-03-02 16:08:40 (GMT)
commit2d96b842de6de41816d7a87217e5e2b5c660a358 (patch)
tree381dd139dff6e1c352311288b8943584fed72084 /generic/tclStubInit.c
parent921a0bbbfb177411e3fe27f4c4654909fd599859 (diff)
parentbfaca509637e46e0ffd48c20a60b78c617c7bf44 (diff)
downloadtcl-2d96b842de6de41816d7a87217e5e2b5c660a358.zip
tcl-2d96b842de6de41816d7a87217e5e2b5c660a358.tar.gz
tcl-2d96b842de6de41816d7a87217e5e2b5c660a358.tar.bz2
Merge 8.6 (one forgotten adaptation of surrogate handling, only compiled on Cygwin)
Diffstat (limited to 'generic/tclStubInit.c')
-rw-r--r--generic/tclStubInit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 66bb305..2f98f16 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -338,6 +338,10 @@ Tcl_WinTCharToUtf(
}
blen = Tcl_UniCharToUtf(*w, p);
p += blen;
+ if ((*w >= 0xD800) && (blen < 3)) {
+ /* Indication that high surrogate is handled */
+ blen = 0;
+ }
w++;
}
if (!blen) {