archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-25 14:05:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge revision(s) 53259: [Backport #11862]

Browse source 
* ext/socket/init.c (rsock_init_sock): reject reserved FDs
	  [ruby-core:72445] [Bug #11862]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-02-25 08:50:44 +00:00
parent c9eefd5644
commit af3ab0bb2c
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/socket/init.c
View file

@ -48,12 +48,12 @@ rsock_init_sock(VALUE sock, int fd)
if (fstat(fd, &sbuf) < 0)
rb_sys_fail("fstat(2)");
if (!S_ISSOCK(sbuf.st_mode)) {
if (!S_ISSOCK(sbuf.st_mode) || rb_reserved_fd_p(fd)) {
errno = EBADF;
rb_sys_fail("not a socket file descriptor");
}
#else
if (!rb_w32_is_socket(fd)) {
if (!rb_w32_is_socket(fd) || rb_reserved_fd_p(fd)) {
errno = EBADF;
rb_sys_fail("not a socket file descriptor");
}