diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-24 06:28:35 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-24 06:28:35 +0000 |
commit | 955507313be5003ae132bd92344569da9e7218da (patch) | |
tree | 814368b11695f2e3b1b0ac76f88fa1b0d3d6b806 /string.c | |
parent | aa836e539f154e49587e48791d44f829d239766b (diff) | |
download | ruby-955507313be5003ae132bd92344569da9e7218da.tar.gz |
* string.c (rb_str_rindex): use rb_enc_prev_char instead of repeated str_nth.
patched by Michael Selig [ruby-core:32498]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2488,14 +2488,14 @@ rb_str_rindex(VALUE str, VALUE sub, long pos) e = RSTRING_END(str); t = RSTRING_PTR(sub); slen = RSTRING_LEN(sub); - for (;;) { - s = str_nth(sbeg, e, pos, enc, singlebyte); - if (!s) return -1; + s = str_nth(sbeg, e, pos, enc, singlebyte); + while (s) { if (memcmp(s, t, slen) == 0) { return pos; } if (pos == 0) break; pos--; + s = rb_enc_prev_char(sbeg, s, e, enc); } return -1; } |