summaryrefslogtreecommitdiffstats
path: root/generic/tclEncoding.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-02-08 13:27:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-02-08 13:27:45 (GMT)
commit7d08861d1364270a78ca004cd84c793241a3cdb6 (patch)
tree089c539fb248bb5736fb20e4c0b875c291050bfd /generic/tclEncoding.c
parent2bbfa984bed378c2a095da5dd62f049e3cce793a (diff)
parent03eefb4a38f4195c8ff6e5183932f33b9754d242 (diff)
downloadtcl-7d08861d1364270a78ca004cd84c793241a3cdb6.zip
tcl-7d08861d1364270a78ca004cd84c793241a3cdb6.tar.gz
tcl-7d08861d1364270a78ca004cd84c793241a3cdb6.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
-rw-r--r--generic/tclEncoding.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 63ebdf4..c521826 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3306,6 +3306,7 @@ TableToUtfProc(
} else if (PROFILE_REPLACE(flags)) {
ch = UNICODE_REPLACE_CHAR;
} else {
+ /* For prefix bytes, we don't fallback to cp1252, see [1355b9a874] */
ch = (Tcl_UniChar)byte;
}
} else {
@@ -3326,7 +3327,9 @@ TableToUtfProc(
if (PROFILE_REPLACE(flags)) {
ch = UNICODE_REPLACE_CHAR;
} else {
- ch = (Tcl_UniChar)byte;
+ char chbuf[2];
+ chbuf[0] = byte; chbuf[1] = 0;
+ Tcl_UtfToUniChar(chbuf, &ch);
}
}