summaryrefslogtreecommitdiffstats
path: root/generic/tclUtf.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2003-10-08 14:24:40 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2003-10-08 14:24:40 (GMT)
commit4ba38844faf91c00b0df311fbfa958e36a216475 (patch)
tree1a14dc708ecdaf3d05c05e8ee7e0b36d4778eb67 /generic/tclUtf.c
parentdf6d45b4f6b62d1991c8aee5e5df8f841a28fb1f (diff)
downloadtcl-4ba38844faf91c00b0df311fbfa958e36a216475.zip
tcl-4ba38844faf91c00b0df311fbfa958e36a216475.tar.gz
tcl-4ba38844faf91c00b0df311fbfa958e36a216475.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 {