diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-25 08:45:12 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-25 08:45:12 +0000 |
| commit | c9eefd56440eaaddf0d2a8924452a87e42e89f57 (patch) | |
| tree | 110077690fad4b49461f03420a76f740f9b31614 /ext | |
| parent | 734ac67206cf8ed0205ecb3c4f35410722228697 (diff) | |
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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/init.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ext/socket/init.c b/ext/socket/init.c index d3b875c78d..ada81c5306 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -48,15 +48,18 @@ rsock_init_sock(VALUE sock, int fd) if (fstat(fd, &sbuf) < 0) rb_sys_fail("fstat(2)"); - rb_update_max_fd(fd); - if (!S_ISSOCK(sbuf.st_mode)) - rb_raise(rb_eArgError, "not a socket file descriptor"); + if (!S_ISSOCK(sbuf.st_mode)) { + errno = EBADF; + rb_sys_fail("not a socket file descriptor"); + } #else - rb_update_max_fd(fd); - if (!rb_w32_is_socket(fd)) - rb_raise(rb_eArgError, "not a socket file descriptor"); + if (!rb_w32_is_socket(fd)) { + errno = EBADF; + rb_sys_fail("not a socket file descriptor"); + } #endif + rb_update_max_fd(fd); MakeOpenFile(sock, fp); fp->fd = fd; fp->mode = FMODE_READWRITE|FMODE_DUPLEX; |