diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-06-18 15:54:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-06-18 15:54:38 (GMT) |
| commit | 3c57d80efed172427e5aafa447365cb61439613c (patch) | |
| tree | 339d7c229b1a90e597f5b585135a4ced4bba4f74 /generic/tclParse.c | |
| parent | 04004f3abcabe486568af1e7b026d03670b48ca8 (diff) | |
| download | tcl-3c57d80efed172427e5aafa447365cb61439613c.zip tcl-3c57d80efed172427e5aafa447365cb61439613c.tar.gz tcl-3c57d80efed172427e5aafa447365cb61439613c.tar.bz2 | |
Fix [53cad613d8]: TIP 389 implementation makes Tk tests font-4.12 and font-4.15 fail. One more situation in which high surrogate causes problem
Diffstat (limited to 'generic/tclParse.c')
| -rw-r--r-- | generic/tclParse.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/generic/tclParse.c b/generic/tclParse.c index fc7f77b..f26f933 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -991,15 +991,13 @@ TclParseBackslash( if (readPtr != NULL) { *readPtr = count; } -#if TCL_UTF_MAX >= 4 - if ((result & 0xFC00) == 0xD800) { - dst[2] = (char) ((result | 0x80) & 0xBF); - dst[1] = (char) (((result >> 6) | 0x80) & 0xBF); - dst[0] = (char) ((result >> 12) | 0xE0); - return 3; + count = Tcl_UniCharToUtf(result, dst); +#if TCL_UTF_MAX > 3 + if (!count) { + count = Tcl_UniCharToUtf(-1, dst); } #endif - return Tcl_UniCharToUtf(result, dst); + return count; } /* |