From cd7b5c2d6c664e589062f3f400bd0498225a56cb Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 1 Jan 2008 05:16:49 +0000 Subject: * string.c (rb_str_substr): offset movement bug. a patch from Vincent Isambart in [ruby-core:14647]. [ruby-core:14644] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index d569ce544..87f61a332 100644 --- a/string.c +++ b/string.c @@ -832,10 +832,10 @@ rb_str_substr(VALUE str, long beg, long len) if (len > -beg) len = -beg; if (-beg * rb_enc_mbmaxlen(enc) < RSTRING_LEN(str) / 8) { beg = -beg; - while (len++ < beg && (e = rb_enc_prev_char(s, e, enc)) != 0); + while (beg-- > len && (e = rb_enc_prev_char(s, e, enc)) != 0); p = e; if (!p) return Qnil; - while (beg-- > 0 && (p = rb_enc_prev_char(s, p, enc)) != 0); + while (len-- > 0 && (p = rb_enc_prev_char(s, p, enc)) != 0); if (!p) return Qnil; len = e - p; goto sub; -- cgit