diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-21 18:57:50 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-21 18:57:50 +0000 |
| commit | 409e53dec17a725dfa9963ad7d907185bbb208fb (patch) | |
| tree | 5e9846ac54992b4e1165890dd16b70ccf03bf240 | |
| parent | 3bf3f825c3fee660fd50ef9d7f3f69c8f58b106d (diff) | |
avoid rb_bug on BasicSocket.for_fd(-1)
* ext/socket/init.c (rsock_init_sock): check FD after validating
* test/socket/test_basicsocket.rb (test_for_fd): new
[ruby-core:72418] [Bug #11854]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/init.c | 2 | ||||
| -rw-r--r-- | test/socket/test_basicsocket.rb | 11 |
3 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Dec 22 03:57:20 2015 Eric Wong <e@80x24.org> + + * ext/socket/init.c (rsock_init_sock): check FD after validating + * test/socket/test_basicsocket.rb (test_for_fd): new + [ruby-core:72418] [Bug #11854] + Mon Dec 21 21:29:45 2015 Naohisa Goto <ngotogenome@gmail.com> * variable.c (struct ivar_update): rename "extended" to "iv_extended" diff --git a/ext/socket/init.c b/ext/socket/init.c index d0711025a5..bd069263c6 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -61,10 +61,10 @@ rsock_init_sock(VALUE sock, int fd) { rb_io_t *fp; - rb_update_max_fd(fd); if (!is_socket(fd)) rb_raise(rb_eArgError, "not a socket file descriptor"); + rb_update_max_fd(fd); MakeOpenFile(sock, fp); fp->fd = fd; fp->mode = FMODE_READWRITE|FMODE_DUPLEX; diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb index 227034ed26..52732f18f6 100644 --- a/test/socket/test_basicsocket.rb +++ b/test/socket/test_basicsocket.rb @@ -133,4 +133,15 @@ class TestSocket_BasicSocket < Test::Unit::TestCase end end + def test_for_fd + assert_raise(Errno::EBADF, '[ruby-core:72418] [Bug #11854]') do + BasicSocket.for_fd(-1) + end + inet_stream do |sock| + s = BasicSocket.for_fd(sock.fileno) + assert_instance_of BasicSocket, s + s.autoclose = false + sock.close + end + end end if defined?(BasicSocket) |