diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-08 16:49:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-08 16:49:34 (GMT) |
| commit | 39bf69006a6847b4068bd3b9b8debda81197502a (patch) | |
| tree | 70b52470f85e3b4a847f878375ba165993e51082 /generic/tclEncoding.c | |
| parent | 6d5473da308176d953367e33d126cc1ca14ff07a (diff) | |
| parent | d67affb10098d8289d0fd12a5ea738068740ef39 (diff) | |
| download | tcl-39bf69006a6847b4068bd3b9b8debda81197502a.zip tcl-39bf69006a6847b4068bd3b9b8debda81197502a.tar.gz tcl-39bf69006a6847b4068bd3b9b8debda81197502a.tar.bz2 | |
Merge 8.6Merge 8.6
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 50afec0..350a13c 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2409,13 +2409,13 @@ UtfToUtfProc( dst += Tcl_UniCharToUtf(*chPtr, dst); } else { src += TclUtfToUniChar(src, chPtr); - if ((*chPtr & 0xFC00) == 0xD800) { + if ((*chPtr | 0x3FF) == 0xDBFF) { /* A high surrogate character is detected, handle especially */ Tcl_UniChar low = *chPtr; if (src <= srcEnd-3) { Tcl_UtfToUniChar(src, &low); } - if ((low & 0xFC00) != 0xDC00) { + if ((low | 0x3FF) != 0xDFFF) { *dst++ = (char) (((*chPtr >> 12) | 0xE0) & 0xEF); *dst++ = (char) (((*chPtr >> 6) | 0x80) & 0xBF); *dst++ = (char) ((*chPtr | 0x80) & 0xBF); |