diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2025-05-29 15:10:40 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2025-05-29 15:10:40 (GMT) |
| commit | ebff9819e938d250960319a760883dfd30389be3 (patch) | |
| tree | 287d9894b062e2e3746a1bec8bc31662d01da6e8 /generic/tclEncoding.c | |
| parent | c4d746554b140b56bbd49e70503ffff2abcb1e10 (diff) | |
| parent | 59040bcaaaedf28740e64e76c0a798f197caf017 (diff) | |
| download | tcl-ebff9819e938d250960319a760883dfd30389be3.zip tcl-ebff9819e938d250960319a760883dfd30389be3.tar.gz tcl-ebff9819e938d250960319a760883dfd30389be3.tar.bz2 | |
merge trunk
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 5002b87..418317f 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -1228,7 +1228,7 @@ Tcl_ExternalToUtfDStringEx( * and loop. Otherwise, return the result we got. */ if ((result != TCL_CONVERT_NOSPACE) && - !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) { + (result != TCL_CONVERT_MULTIBYTE || (flags & TCL_ENCODING_END))) { Tcl_Size nBytesProcessed = (src - srcStart); Tcl_DStringSetLength(dstPtr, soFar); @@ -1544,7 +1544,7 @@ Tcl_UtfToExternalDStringEx( * and loop. Otherwise, return the result we got. */ if ((result != TCL_CONVERT_NOSPACE) && - !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) { + (result != TCL_CONVERT_MULTIBYTE || (flags & TCL_ENCODING_END))) { Tcl_Size nBytesProcessed = (src - srcStart); Tcl_Size i = soFar + encodingPtr->nullSize - 1; /* Loop as DStringSetLength only stores one nul byte at a time */ |