summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-08 18:51:58 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-08 18:51:58 +0000
commitcb37e4013ef0ce9b3492c2f86e8fd8bf6a2db007 (patch)
tree713082703b0989624420c3f4be46334b02f7f6a3 /ext
parentf429ee01d27cfa8dadd6e7e0c661f28a62489267 (diff)
merge revision(s) 53259: [Backport #11862]
* 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_2@54039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/socket/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 178aad0948..4d7cf29ea3 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -58,7 +58,7 @@ rsock_init_sock(VALUE sock, int fd)
{
rb_io_t *fp;
- if (!is_socket(fd)) {
+ if (!is_socket(fd) || rb_reserved_fd_p(fd)) {
errno = EBADF;
rb_sys_fail("not a socket file descriptor");
}