diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-29 07:06:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-29 07:06:21 +0000 |
| commit | d571f1ee694b4dc77e33db39b9c911add8853703 (patch) | |
| tree | 0184e51b6430722c8543fa674f6089477b6399d2 | |
| parent | 7e4d5acdfcef6ab407a893950504a2fcc3ce5a4e (diff) | |
| download | ruby-d571f1ee694b4dc77e33db39b9c911add8853703.tar.gz ruby-d571f1ee694b4dc77e33db39b9c911add8853703.tar.xz ruby-d571f1ee694b4dc77e33db39b9c911add8853703.zip | |
* ext/stringio/stringio.c (strio_write): insufficiently filled string
being extended when overwriting. [ruby-core:03836]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 2 | ||||
| -rw-r--r-- | test/stringio/test_stringio.rb | 10 |
3 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Nov 29 16:06:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/stringio/stringio.c (strio_write): insufficiently filled string + being extended when overwriting. [ruby-core:03836] + Mon Nov 29 15:22:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 09ecc6926..8750262c1 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -794,7 +794,7 @@ strio_write(self, str) else { if (ptr->pos + len > olen) { rb_str_resize(ptr->string, ptr->pos + len); - MEMZERO(RSTRING(ptr->string)->ptr + olen, char, ptr->pos - olen); + MEMZERO(RSTRING(ptr->string)->ptr + olen, char, ptr->pos + len - olen); } else { rb_str_modify(ptr->string); diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb index fee305e85..de15ab550 100644 --- a/test/stringio/test_stringio.rb +++ b/test/stringio/test_stringio.rb @@ -30,4 +30,14 @@ class TestStringIO < Test::Unit::TestCase io.print "last" assert_equal("\0" * n + "last", io.string) end + + def test_overwrite # [ruby-core:03836] + stringio = StringIO.new + responses = ['', 'just another ruby', 'hacker'] + responses.each do |resp| + stringio.puts(resp) + stringio.rewind + end + assert_equal("hacker\nother ruby\n", stringio.string) + end end |