diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:46:26 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:46:26 +0000 |
| commit | 1cc6f36317558a48ccf05ff5758af0c4cd455b79 (patch) | |
| tree | 480b6373144a116e7bd179311222e733b8fdf3b9 /ext | |
| parent | 54dc1cf1eda9afac1c43fd21cd077ac216f75730 (diff) | |
merge revision(s) 49797: [Backport #10923]
* ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX
Thanks to Yura Sokolov <funny.falcon@gmail.com>
[ruby-core:68369] [Bug#10923]
* test/io/wait/test_io_wait.rb (test_nread_buffered):
fix broken test
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/io/wait/wait.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c index 7e17cb2e89..fd32be79b1 100644 --- a/ext/io/wait/wait.c +++ b/ext/io/wait/wait.c @@ -62,7 +62,7 @@ io_nread(VALUE io) GetOpenFile(io, fptr); rb_io_check_readable(fptr); len = rb_io_read_pending(fptr); - if (len > 0) return len; + if (len > 0) return INT2FIX(len); if (!FIONREAD_POSSIBLE_P(fptr->fd)) return INT2FIX(0); if (ioctl(fptr->fd, FIONREAD, &n)) return INT2FIX(0); if (n > 0) return ioctl_arg2num(n); |