diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 11:01:21 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 11:01:21 +0000 |
| commit | 05709d7d8efd46cf78bd339a4ed355697b21bc8f (patch) | |
| tree | 91d69e9e683d542eb0764ce2a6b5fb2c5d2e7fe9 | |
| parent | 050ddca6f67be947f8a29b7eabf3e18130b16177 (diff) | |
| download | ruby-05709d7d8efd46cf78bd339a4ed355697b21bc8f.tar.gz ruby-05709d7d8efd46cf78bd339a4ed355697b21bc8f.tar.xz ruby-05709d7d8efd46cf78bd339a4ed355697b21bc8f.zip | |
merges r20150 from trunk into ruby_1_9_1.
* ext/stringio/stringio.c (strio_ungetc): ungetc position should
not be changed from 1.8. [ruby-core:19632]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Nov 8 17:31:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/stringio/stringio.c (strio_ungetc): ungetc position should + not be changed from 1.8. [ruby-core:19632] + Sat Nov 8 17:15:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/optparse.rb (OptionParser#make_switch): 1.9 Symbols respond diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 191c1024c..4c997dcd0 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -721,7 +721,7 @@ strio_ungetc(VALUE self, VALUE c) } } /* get logical position */ - lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos - 1; + lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos; for (;;) { clen = rb_enc_mbclen(p, pend, enc); if (p+clen >= pend) break; |