From ea64014c56374043926e95906fff06b4dfcd051b Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 20 Jan 2008 18:45:51 +0000 Subject: * string.c (rb_str_each_char): advance offset before get next char length. [ruby-dev:33211] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index 9242877a35..f95d2e8915 100644 --- a/string.c +++ b/string.c @@ -4599,10 +4599,11 @@ rb_str_each_char(VALUE str) len = RSTRING_LEN(str); enc = rb_enc_get(str); n = rb_enc_mbclen(ptr, ptr + len, enc); - for (i = 0; i < len; i += n) { + for (i = 0; i < len;) { rb_yield(rb_str_subseq(str, i, n)); ptr = RSTRING_PTR(str); len = RSTRING_LEN(str); + if ((i += n) >= len) break; enc = rb_enc_get(str); s = rb_enc_left_char_head(ptr, ptr + i, enc); n = rb_enc_mbclen(s, ptr + len, enc); -- cgit v1.2.3