* ext/stringio/stringio.c (strio_read): clear the buffer argument

  when returning nil.  [ruby-dev:22363]

* test/ruby/ut_eof.rb (TestEOF::test_eof_0, TestEOF::test_eof_1):
  add buffer argument tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 20 insertions, 0 deletions

diff --git a/test/ruby/ut_eof.rb b/test/ruby/ut_eof.rb
index 8b3cc8101b..eff0bddc0b 100644
--- a/test/ruby/ut_eof.rb
+++ b/test/ruby/ut_eof.rb
@@ -14,6 +14,16 @@ module TestEOF
       assert_equal("", f.read)
       assert_nil(f.read(1))
     }
+    open_file("") {|f|
+      s = "x"
+      assert_equal("", f.read(nil, s))
+      assert_equal("", s)
+    }
+    open_file("") {|f|
+      s = "x"
+      assert_nil(f.read(10, s))
+      assert_equal("", s)
+    }
   end
 
   def test_eof_0_rw
@@ -61,6 +71,16 @@ module TestEOF
       assert_equal("a", f.read)
       assert_nil(f.read(0))
     }
+    open_file("a") {|f|
+      s = "x"
+      assert_equal("a", f.read(nil, s))
+      assert_equal("a", s)
+    }
+    open_file("a") {|f|
+      s = "x"
+      assert_equal("a", f.read(10, s))
+      assert_equal("a", s)
+    }
   end
 
   module Seek