summaryrefslogtreecommitdiffstats
path: root/generic/tclUtf.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-05-25 06:55:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-05-25 06:55:17 (GMT)
commit020fea0acd1d6213f31169581c9fb02bc5a9f82b (patch)
tree93579132db564aecf807c5785c3535fb0e9f6868 /generic/tclUtf.c
parentca0f6f2273f4dd8d7b7449a4da43e34d5a98d4f2 (diff)
parent51ac01d942b4740082f2d478c512d4108699040b (diff)
downloadtcl-020fea0acd1d6213f31169581c9fb02bc5a9f82b.zip
tcl-020fea0acd1d6213f31169581c9fb02bc5a9f82b.tar.gz
tcl-020fea0acd1d6213f31169581c9fb02bc5a9f82b.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclUtf.c')
-rw-r--r--generic/tclUtf.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 54b7eb0..4cbe31c 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -773,11 +773,17 @@ Tcl_UtfAtIndex(
register size_t index) /* The position of the desired character. */
{
Tcl_UniChar ch = 0;
+#if TCL_UTF_MAX <= 4
int len = 1;
+#endif
if (index != (size_t)-1) {
while (index--) {
+#if TCL_UTF_MAX <= 4
+ src += (len = TclUtfToUniChar(src, &ch));
+#else
src += TclUtfToUniChar(src, &ch);
+#endif
}
#if TCL_UTF_MAX <= 4
if (!len) {