diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-15 10:09:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-15 10:09:11 (GMT) |
| commit | e5b1e20b49d4610ec84dc2da862b19d6119452d4 (patch) | |
| tree | 132b4831c95ba4f1dce118cf44d2790feb4548e8 /generic/tclEncoding.c | |
| parent | c28a047f8ac27cc47e0e47578bddc491c72bd9ae (diff) | |
| parent | e00ef49560bb5bd4349d017887c7cd5a2d0ba38e (diff) | |
| download | tcl-e5b1e20b49d4610ec84dc2da862b19d6119452d4.zip tcl-e5b1e20b49d4610ec84dc2da862b19d6119452d4.tar.gz tcl-e5b1e20b49d4610ec84dc2da862b19d6119452d4.tar.bz2 | |
Merge 8.6.
Also fix the use of WUR (warn unused result) in libtommath function signatures: this cannot be used in combination with "deprecated" or "nostub"
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 48e198b..e318d5b 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2366,7 +2366,7 @@ UtfToUtfProc( } dstStart = dst; - dstEnd = dst + dstLen - ((pureNullMode == 1) ? 4 : TCL_UTF_MAX); + dstEnd = dst + dstLen - TCL_UTF_MAX; for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) { if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) { @@ -2412,21 +2412,14 @@ UtfToUtfProc( if ((*chPtr & 0xFC00) == 0xD800) { /* A high surrogate character is detected, handle especially */ Tcl_UniChar low = *chPtr; - size_t len = Tcl_UtfToUniChar(src, &low); + if (src <= srcEnd-3) { + Tcl_UtfToUniChar(src, &low); + } if ((low & 0xFC00) != 0xDC00) { *dst++ = (char) (((*chPtr >> 12) | 0xE0) & 0xEF); *dst++ = (char) (((*chPtr >> 6) | 0x80) & 0xBF); *dst++ = (char) ((*chPtr | 0x80) & 0xBF); continue; - } else if (pureNullMode == 1) { - int full = (((*chPtr & 0x3FF) << 10) | (low & 0x3FF)) + 0x10000; - *dst++ = (char) (((full >> 18) | 0xF0) & 0xF7); - *dst++ = (char) (((full >> 12) | 0x80) & 0xBF); - *dst++ = (char) (((full >> 6) | 0x80) & 0xBF); - *dst++ = (char) ((full | 0x80) & 0xBF); - *chPtr = 0; - src += len; - continue; } } dst += Tcl_UniCharToUtf(*chPtr, dst); |