---

yaml
---
r: 11008
b: refs/heads/master
c: e127bf6
h: refs/heads/master
v: v3

Author: kevina

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 33f4a9838887f03cf5c76e5b470efecaff233636
+refs/heads/master: e127bf680f8a133f339901e05a44ac20b5faed3e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/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;
 }