diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-31 12:06:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-31 12:06:51 (GMT) |
| commit | 66bf50e520e105566da6e6d61e0da299a4c22f3e (patch) | |
| tree | 7ffd304c261d5ce79b17d8e847fd1be4b13e539c /generic | |
| parent | 85d70230296a50fa8805dca4b6a7281746759c7a (diff) | |
| parent | a88091c1bf14f254449273a9f864d8f09009fe67 (diff) | |
| download | tcl-66bf50e520e105566da6e6d61e0da299a4c22f3e.zip tcl-66bf50e520e105566da6e6d61e0da299a4c22f3e.tar.gz tcl-66bf50e520e105566da6e6d61e0da299a4c22f3e.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic')
| -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 b33bf6a..eec4068 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -292,7 +292,9 @@ Tcl_UtfToUniChar( */ *chPtr = (Tcl_UniChar) (((byte & 0x1F) << 6) | (src[1] & 0x3F)); - return 2; + if ((*chPtr == 0) || (*chPtr > 0x7f)) { + return 2; + } } /* @@ -307,7 +309,9 @@ Tcl_UtfToUniChar( *chPtr = (Tcl_UniChar) (((byte & 0x0F) << 12) | ((src[1] & 0x3F) << 6) | (src[2] & 0x3F)); - return 3; + if (*chPtr > 0x7ff) { + return 3; + } } /* @@ -324,7 +328,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; + } } /* |