diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-09 14:53:19 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-09 14:53:19 +0000 |
commit | 79a3b7797f559d3aa41816368c8a3c1fb26f4530 (patch) | |
tree | 8bf6a243ba76759541f737c63c120aa3353175e7 /ext/socket | |
parent | c13142643d846b3805296babf81f81791378122d (diff) | |
download | ruby-79a3b7797f559d3aa41816368c8a3c1fb26f4530.tar.gz |
* ext/socket/ipsocket.c (init_inetsock_internal),
ext/socket/unixsocket.c (rsock_init_unixsock): check the result of
listen(2). based on a patch from Mike Pomraning. [ruby-core:23698]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
-rw-r--r-- | ext/socket/ipsocket.c | 9 | ||||
-rw-r--r-- | ext/socket/unixsocket.c | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c index 447ae40db6..b6b2426e97 100644 --- a/ext/socket/ipsocket.c +++ b/ext/socket/ipsocket.c @@ -104,8 +104,13 @@ init_inetsock_internal(struct inetsock_arg *arg) arg->fd = -1; - if (type == INET_SERVER) - listen(fd, 5); + if (type == INET_SERVER) { + status = listen(fd, 5); + if (status < 0) { + close(fd); + syscall = "listen(2)"; + } + } /* create new instance */ return rsock_init_sock(arg->sock, fd); diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 907f89cc49..4c3c5a7f7a 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -65,7 +65,12 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server) rb_sys_fail(sockaddr.sun_path); } - if (server) listen(fd, 5); + if (server) { + if (listen(fd, 5) < 0) { + close(fd); + rb_sys_fail("listen(2)"); + } + } rsock_init_sock(sock, fd); if (server) { |