summaryrefslogtreecommitdiffstats
path: root/generic/tclParse.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2018-10-17 19:47:01 (GMT)
committerdgp <dgp@users.sourceforge.net>2018-10-17 19:47:01 (GMT)
commit1b03667a27e4f198e48c344454663aae4c085a14 (patch)
tree70bbdddb4f6bdec0c26dd22cf8ccd499b1c97416 /generic/tclParse.c
parent5c24bebd2b402df644549d6c0efe6586dde65891 (diff)
parente154c5151281fbbe01ef1361f5f6980a5ec5a6d3 (diff)
downloadtcl-1b03667a27e4f198e48c344454663aae4c085a14.zip
tcl-1b03667a27e4f198e48c344454663aae4c085a14.tar.gz
tcl-1b03667a27e4f198e48c344454663aae4c085a14.tar.bz2
merge 8.7
Diffstat (limited to 'generic/tclParse.c')
-rw-r--r--generic/tclParse.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/generic/tclParse.c b/generic/tclParse.c
index 7c0b7db..d1fdbc7 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -979,7 +979,12 @@ TclParseBackslash(
if (readPtr != NULL) {
*readPtr = count;
}
- return Tcl_UniCharToUtf(result, dst);
+ count = Tcl_UniCharToUtf(result, dst);
+ if (!count) {
+ /* Special case for handling upper surrogates. */
+ count = Tcl_UniCharToUtf(-1, dst);
+ }
+ return count;
}
/*