diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-06-05 17:22:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-06-05 17:22:31 (GMT) |
| commit | f619bf51a3308fa3933f35c2aef066009fd45b42 (patch) | |
| tree | 95617fb55ba3dc7fb235e0e08507cb9fa2c0ffaa /generic/tclUtf.c | |
| parent | 4cd1e4ceff0f24728a6444ac699b58a3461f8447 (diff) | |
| parent | 67fd012128e6e76e3d745ca090075acbcfa9f258 (diff) | |
| download | tcl-f619bf51a3308fa3933f35c2aef066009fd45b42.zip tcl-f619bf51a3308fa3933f35c2aef066009fd45b42.tar.gz tcl-f619bf51a3308fa3933f35c2aef066009fd45b42.tar.bz2 | |
Merge 8.6; update changes.
Diffstat (limited to 'generic/tclUtf.c')
| -rw-r--r-- | generic/tclUtf.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c index 68119a4..fe47f0b 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -298,7 +298,9 @@ Tcl_UtfToUniChar( */ *chPtr = (Tcl_UniChar) (((byte & 0x1F) << 6) | (src[1] & 0x3F)); - return 2; + if ((*chPtr == 0) || (*chPtr > 0x7f)) { + return 2; + } } /* @@ -313,7 +315,9 @@ Tcl_UtfToUniChar( *chPtr = (Tcl_UniChar) (((byte & 0x0F) << 12) | ((src[1] & 0x3F) << 6) | (src[2] & 0x3F)); - return 3; + if (*chPtr > 0x7ff) { + return 3; + } } /* @@ -330,7 +334,9 @@ Tcl_UtfToUniChar( *chPtr = (Tcl_UniChar) (((byte & 0x0E) << 18) | ((src[1] & 0x3F) << 12) | ((src[2] & 0x3F) << 6) | (src[3] & 0x3F)); - return 4; + if ((*chPtr <= 0x10ffff) && (*chPtr > 0xffff)) { + return 4; + } } /* |