summaryrefslogtreecommitdiffstats
path: root/generic/tclEncoding.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-04 15:32:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-04 15:32:17 (GMT)
commit29be47f4511520e0e8efac664661d17195c8fea1 (patch)
tree5a04716bef3e6f774a44471d082b0aa937f44cbf /generic/tclEncoding.c
parent58bf5b79b7e9fa16903e3796a77e212afee94d31 (diff)
parentc47a86166324a3e2efe9359c431bb93f7519847c (diff)
downloadtcl-29be47f4511520e0e8efac664661d17195c8fea1.zip
tcl-29be47f4511520e0e8efac664661d17195c8fea1.tar.gz
tcl-29be47f4511520e0e8efac664661d17195c8fea1.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
-rw-r--r--generic/tclEncoding.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 9718f37..d597084 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2570,7 +2570,7 @@ UtfToUtf16Proc(
*dst++ = (((*chPtr - 0x10000) >> 10) & 0xFF);
*dst++ = (((*chPtr - 0x10000) >> 18) & 0x3) | 0xD8;
*dst++ = (*chPtr & 0xFF);
- *dst++ = ((*chPtr & 0x3) >> 8) | 0xDC;
+ *dst++ = ((*chPtr >> 8) & 0x3) | 0xDC;
}
#else
*dst++ = (*chPtr & 0xFF);
@@ -2582,10 +2582,10 @@ UtfToUtf16Proc(
*dst++ = (*chPtr >> 8);
*dst++ = (*chPtr & 0xFF);
} else {
- *dst++ = ((*chPtr & 0x3) >> 8) | 0xDC;
- *dst++ = (*chPtr & 0xFF);
*dst++ = (((*chPtr - 0x10000) >> 18) & 0x3) | 0xD8;
*dst++ = (((*chPtr - 0x10000) >> 10) & 0xFF);
+ *dst++ = ((*chPtr >> 8) & 0x3) | 0xDC;
+ *dst++ = (*chPtr & 0xFF);
}
#else
*dst++ = (*chPtr >> 8);