aboutsummaryrefslogtreecommitdiffstats
path: root/ext/stringio
diff options
context:
space:
mode:
authorglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-27 12:21:17 +0000
committerglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-27 12:21:17 +0000
commit89182621d9949b24e67d48b751a1997e9eeb06ec (patch)
treec77c553147f424cb4adcfafdca84f7486f7e15d4 /ext/stringio
parent22691e7f6b88a58f9d874b07ce09e2f82bfd112f (diff)
downloadruby-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
Diffstat (limited to 'ext/stringio')
-rw-r--r--ext/stringio/stringio.c2
1 files changed, 1 insertions, 1 deletions
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;
}