diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-23 10:49:07 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-23 10:49:07 +0000 |
commit | 91c7169daf6f900ca03c58a7743a0b991e8f5371 (patch) | |
tree | 769b871e4d5595b6bf694ff336305cb2e4677b80 /ext | |
parent | a46abacacd00e7f9940bae7680383df0d2684f79 (diff) |
merges r30063 from trunk into ruby_1_9_2.
--
* ext/stringio/stringio.c (strio_getline): round upto next char
boundary. [ruby-dev:42674]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/stringio/stringio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index c93ba10466..cfc1001d35 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -952,7 +952,7 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr) e = s + RSTRING_LEN(ptr->string); s += ptr->pos; if (limit > 0 && s + limit < e) { - e = s + limit; + e = rb_enc_right_char_head(s, s + limit, e, rb_enc_get(ptr->string)); } if (NIL_P(str)) { str = strio_substr(ptr, ptr->pos, e - s); |