summaryrefslogtreecommitdiffstats
path: root/generic/tclParse.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2018-09-11 15:39:20 (GMT)
committerdgp <dgp@users.sourceforge.net>2018-09-11 15:39:20 (GMT)
commit4252e1f99f58589cf3ab90f0d2fe8f83f48fd996 (patch)
treef3fc939283abbcd82e735a1fece13773a5d35ee0 /generic/tclParse.c
parent9db2475e4e15362e1c9baeef193c1bb701fbe13e (diff)
parent4b7caf2e4a373d2616cc7d4f3d05566bd1588b6d (diff)
downloadtcl-4252e1f99f58589cf3ab90f0d2fe8f83f48fd996.zip
tcl-4252e1f99f58589cf3ab90f0d2fe8f83f48fd996.tar.gz
tcl-4252e1f99f58589cf3ab90f0d2fe8f83f48fd996.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 a2227f7..00b83a1 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;
}
/*