summaryrefslogtreecommitdiffstats
path: root/generic/tclUtf.c
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2003-10-08 14:24:40 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2003-10-08 14:24:40 (GMT)
commit095421822a1b0eafda5f745e470a032499fc807c (patch)
tree1a14dc708ecdaf3d05c05e8ee7e0b36d4778eb67 /generic/tclUtf.c
parent10aeafc1b3e7bebe457555e6c9bf3557556f0d7d (diff)
downloadtcl-095421822a1b0eafda5f745e470a032499fc807c.zip
tcl-095421822a1b0eafda5f745e470a032499fc807c.tar.gz
tcl-095421822a1b0eafda5f745e470a032499fc807c.tar.bz2
Made Tcl_NumUtfChars do the right thing with \u0000 when guessing the length
because of a negative 'length' parameter. [Bug 769812]
Diffstat (limited to 'generic/tclUtf.c')
-rw-r--r--generic/tclUtf.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 2e464ed..f0acdd2 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUtf.c,v 1.31 2003/03/06 23:27:14 dgp Exp $
+ * RCS: @(#) $Id: tclUtf.c,v 1.32 2003/10/08 14:24:41 dkf Exp $
*/
#include "tclInt.h"
@@ -501,11 +501,8 @@ Tcl_NumUtfChars(str, len)
i = 0;
if (len < 0) {
- while (1) {
+ while (*str != '\0') {
str += TclUtfToUniChar(str, chPtr);
- if (ch == '\0') {
- break;
- }
i++;
}
} else {