diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-06 12:45:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-06 12:45:48 (GMT) |
| commit | 7fc88ec260bb481aed05458cf999aa3b812edb40 (patch) | |
| tree | 53afa8ab765019678ef6446886d21683735d8880 /generic/tclEncoding.c | |
| parent | 11cb1fe5f6062bb27f3bc8a3792919d5bb0a4f32 (diff) | |
| parent | 667d40ea7d58b8be65eafdda5c019f96ec05d635 (diff) | |
| download | tcl-7fc88ec260bb481aed05458cf999aa3b812edb40.zip tcl-7fc88ec260bb481aed05458cf999aa3b812edb40.tar.gz tcl-7fc88ec260bb481aed05458cf999aa3b812edb40.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index c211dfb..d780299 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2592,16 +2592,8 @@ UtfToUtfProc( *dst++ = (char) (((ch >> 6) | 0x80) & 0xBF); *dst++ = (char) ((ch | 0x80) & 0xBF); continue; - } else if (PROFILE_STRICT(profile) && - (!(flags & ENCODING_INPUT)) && - SURROGATE(ch)) { - result = TCL_CONVERT_UNKNOWN; - src = saveSrc; - break; - } else if (PROFILE_STRICT(profile) && - (flags & ENCODING_INPUT) && - SURROGATE(ch)) { - result = TCL_CONVERT_SYNTAX; + } else if (PROFILE_STRICT(profile) && SURROGATE(ch)) { + result = (flags & ENCODING_INPUT) ? TCL_CONVERT_SYNTAX : TCL_CONVERT_UNKNOWN; src = saveSrc; break; } |