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/tclStringObj.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/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index a503392..1795d0c 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -1996,6 +1996,12 @@ Tcl_AppendFormatToObj( goto error; } length = Tcl_UniCharToUtf(code, buf); +#if TCL_UTF_MAX > 3 + if (!length) { + /* Special case for handling upper surrogates. */ + length = Tcl_UniCharToUtf(-1, buf); + } +#endif segment = Tcl_NewStringObj(buf, length); Tcl_IncrRefCount(segment); allocSegment = 1; |