From e127bf680f8a133f339901e05a44ac20b5faed3e Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <kevina@cs.utah.edu>
Date: Tue, 24 Jan 2012 22:57:51 -0700
Subject: [PATCH] Fix byte_len in char_len_range to be what it is advertised.

---
 src/libcore/str.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index aaf10365983..ecb9827b85e 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -1066,15 +1066,15 @@ Safety note:
 FIXME: rename to 'substr_len_chars'
 */
 fn char_len_range(s: str, byte_start: uint, byte_len: uint) -> uint {
-    let i     = byte_start;
+    let i         = byte_start;
+    let byte_stop = i + byte_len;
     let len   = 0u;
-    while i < byte_len {
+    while i < byte_stop {
         let chsize = utf8_char_width(s[i]);
         assert (chsize > 0u);
         len += 1u;
         i += chsize;
     }
-    assert (i == byte_len);
     ret len;
 }