diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-02-17 19:15:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-02-17 19:15:28 (GMT) |
| commit | 0892c6f37c9e2638565bf7f8641fa137e46648c3 (patch) | |
| tree | 173ba5830e297f93ab7211772d6a99763d164ccc /generic/tclEncoding.c | |
| parent | 6d674a96a1b99426cabf17e5b52272399c73e8bc (diff) | |
| parent | c731ca1ffdd3e7cc90cf064ac89b2f71551958ce (diff) | |
| download | tcl-0892c6f37c9e2638565bf7f8641fa137e46648c3.zip tcl-0892c6f37c9e2638565bf7f8641fa137e46648c3.tar.gz tcl-0892c6f37c9e2638565bf7f8641fa137e46648c3.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 07acb13..0133e3d 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2354,16 +2354,14 @@ UtfToUtfProc( result = TCL_CONVERT_MULTIBYTE; break; } - if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX)) { - result = TCL_CONVERT_SYNTAX; - break; - } - ch = UCHAR(*src++); - } else { - char chbuf[2]; - chbuf[0] = UCHAR(*src++); chbuf[1] = 0; - TclUtfToUCS4(chbuf, &ch); + if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX)) { + result = TCL_CONVERT_SYNTAX; + break; + } } + char chbuf[2]; + chbuf[0] = UCHAR(*src++); chbuf[1] = 0; + TclUtfToUCS4(chbuf, &ch); dst += Tcl_UniCharToUtf(ch, dst); } else { size_t len = TclUtfToUCS4(src, &ch); |