diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-28 21:17:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-28 21:17:02 (GMT) |
| commit | 924a7fca6bea3136eae5a8f22a1ffc7029e2b5eb (patch) | |
| tree | f66d9de660406181d898bcaa1016de813e73c293 /generic | |
| parent | eb2fa54e3275b224043744cb0e305e80b16cbd9c (diff) | |
| parent | a20259dc94d0137061e00e237a128fe3d7589985 (diff) | |
| download | tcl-924a7fca6bea3136eae5a8f22a1ffc7029e2b5eb.zip tcl-924a7fca6bea3136eae5a8f22a1ffc7029e2b5eb.tar.gz tcl-924a7fca6bea3136eae5a8f22a1ffc7029e2b5eb.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclParse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclParse.c b/generic/tclParse.c index 8ab4a26..e42acbe 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -869,13 +869,13 @@ TclParseBackslash( * No hexdigits -> This is just "u". */ result = 'u'; - } else if (((result & 0xDC00) == 0xD800) && (count == 6) + } else if (((result & 0xFC00) == 0xD800) && (count == 6) && (p[5] == '\\') && (p[6] == 'u') && (numBytes >= 10)) { /* If high surrogate is immediately followed by a low surrogate * escape, combine them into one character. */ int low; int count2 = ParseHex(p+7, 4, &low); - if ((count2 == 4) && ((low & 0xDC00) == 0xDC00)) { + if ((count2 == 4) && ((low & 0xFC00) == 0xDC00)) { result = ((result & 0x3FF)<<10 | (low & 0x3FF)) + 0x10000; count += count2 + 2; } |