diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-21 11:57:39 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-21 11:57:39 (GMT) |
| commit | aa0d55b4045974f7c2c1fb2042a06b1d0a4ea67d (patch) | |
| tree | ba1f6d2e9a461e105c7fc838855a441bcc73faec /generic/tclEncoding.c | |
| parent | f567767f65983e81994ba6b29de78cede613109b (diff) | |
| parent | 04234b55afe944221c2b003572689431778c7c88 (diff) | |
| download | tcl-aa0d55b4045974f7c2c1fb2042a06b1d0a4ea67d.zip tcl-aa0d55b4045974f7c2c1fb2042a06b1d0a4ea67d.tar.gz tcl-aa0d55b4045974f7c2c1fb2042a06b1d0a4ea67d.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 9bce621..cfc8caa 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2304,7 +2304,7 @@ UtfToUtfProc( */ if (flags & TCL_ENCODING_MODIFIED) { - if (!(flags & TCL_ENCODING_NOCOMPLAIN)) { + if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (flags & TCL_ENCODING_CHAR_LIMIT)) { result = TCL_CONVERT_MULTIBYTE; break; } @@ -3085,7 +3085,7 @@ TableFromUtfProc( word = fromUnicode[(ch >> 8)][ch & 0xFF]; if ((word == 0) && (ch != 0)) { - if (!(flags & TCL_ENCODING_NOCOMPLAIN)) { + if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (flags & TCL_ENCODING_CHAR_LIMIT)) { result = TCL_CONVERT_UNKNOWN; break; } |