1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/stringio/stringio.c (strio_each, strio_readlines):

Browse Source 
Use `NUM2LONG` instead of `FIX2INT`. Fixes [ruby-dev:43395].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
sorah 2011-04-09 15:10:03 +00:00
parent 4e817b39b4
commit 6eb7740472
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Apr 9 23:31:47 2011 Shota Fukumori <sorah@tubusu.net>
* ext/stringio/stringio.c (strio_each, strio_readlines):
Use `NUM2LONG` instead of `FIX2INT`. Fixes [ruby-dev:43395].
Sat Apr 9 23:22:27 2011 Shota Fukumori <sorah@tubusu.net> Sat Apr 9 23:22:27 2011 Shota Fukumori <sorah@tubusu.net>
* ext/stringio/stringio.c (strio_each): * ext/stringio/stringio.c (strio_each):

8
ext/stringio/stringio.c
View File

@ -1069,8 +1069,8 @@ strio_each(int argc, VALUE *argv, VALUE self)
RETURN_ENUMERATOR(self, argc, argv); RETURN_ENUMERATOR(self, argc, argv);
if(argc > 0 && TYPE(argv[argc-1]) == T_FIXNUM && if(argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
FIX2INT(argv[argc-1]) == 0) { NUM2LONG(argv[argc-1]) == 0) {
rb_raise(rb_eArgError, "invalid limit: 0 for each_line"); rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
} }
@ -1094,8 +1094,8 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
struct StringIO *ptr = StringIO(self); struct StringIO *ptr = StringIO(self);
VALUE ary = rb_ary_new(), line; VALUE ary = rb_ary_new(), line;
if(argc > 0 && TYPE(argv[argc-1]) == T_FIXNUM && if(argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
FIX2INT(argv[argc-1]) == 0) { NUM2LONG(argv[argc-1]) == 0) {
rb_raise(rb_eArgError, "invalid limit: 0 for readlines"); rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
} }