diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 12:49:06 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 12:49:06 +0000 |
| commit | 4295f3d99eccd368e4e08eb9c1d114660e4ea921 (patch) | |
| tree | 4bc2596978892dc2ae7d23f00945014c76d0993a /ext/stringio | |
| parent | 99b93302eac2c955d0e18239138e1dd0691e253e (diff) | |
merges r22253 from trunk into ruby_1_9_1.
* ext/stringio/stringio.c (strio_ungetc): calculates new position
before reallocation. [Bug#1099]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/stringio')
| -rw-r--r-- | ext/stringio/stringio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 4ff0e36c6..ce1d55fd4 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -728,8 +728,9 @@ strio_ungetc(VALUE self, VALUE c) p += clen; lpos++; } + clen = p - RSTRING_PTR(ptr->string); rb_str_update(ptr->string, lpos, ptr->pos ? 1 : 0, c); - ptr->pos = p - RSTRING_PTR(ptr->string); + ptr->pos = clen; return Qnil; } |