diff options
| author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-27 12:21:17 +0000 |
|---|---|---|
| committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-27 12:21:17 +0000 |
| commit | 89182621d9949b24e67d48b751a1997e9eeb06ec (patch) | |
| tree | c77c553147f424cb4adcfafdca84f7486f7e15d4 | |
| parent | 22691e7f6b88a58f9d874b07ce09e2f82bfd112f (diff) | |
| download | ruby-89182621d9949b24e67d48b751a1997e9eeb06ec.tar.gz | |
* ext/stringio/stringio.c (strio_getline): fix not to raise TypeError
when limit is nil.
[Bug #7232] [ruby-core:48531]
* test/stringio/test_stringio.rb: a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 2 | ||||
| -rw-r--r-- | test/stringio/test_stringio.rb | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Thu Dec 27 20:45:29 2012 Masaki Matsushita <glass.saga@gmail.com> + + * ext/stringio/stringio.c (strio_getline): fix not to raise TypeError + when limit is nil. + [Bug #7232] [ruby-core:48531] + + * test/stringio/test_stringio.rb: a test for above. + Thu Dec 27 21:08:23 2012 Charlie Somerville <charlie@charliesomerville.com> * vm_core.h (VM_DEFINECLASS_TYPE): explicit cast to enum type to avoid 64->32 diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 501c7ddddf..26872e0978 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -987,7 +987,7 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr) case 2: if (!NIL_P(str)) StringValue(str); - limit = NUM2LONG(lim); + if (!NIL_P(lim)) limit = NUM2LONG(lim); break; } diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb index 0ea3e4f961..0eceeba894 100644 --- a/test/stringio/test_stringio.rb +++ b/test/stringio/test_stringio.rb @@ -52,7 +52,7 @@ class TestStringIO < Test::Unit::TestCase assert_equal("abc\n\ndef\n", StringIO.new("abc\n\ndef\n").gets(nil)) assert_equal("abc\n\n", StringIO.new("abc\n\ndef\n").gets("")) assert_raise(TypeError){StringIO.new("").gets(1, 1)} - assert_raise(TypeError){StringIO.new("").gets(nil, nil)} + assert_nothing_raised {StringIO.new("").gets(nil, nil)} end def test_readlines |