1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 53231,53244: [Backport #11854]

* 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/branches/ruby_2_1@53923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-02-25 08:45:12 +00:00
parent 734ac67206
commit c9eefd5644
4 changed files with 27 additions and 7 deletions

View file

@ -85,4 +85,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)