1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipsocket.c: sys_error

Browse Source 
* ext/socket/ipsocket.c (init_inetsock_internal): preserve errno
  before other library calls and use rb_syserr_fail.
  [ruby-core:68531] [Bug #10975]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-04-30 07:39:46 +00:00
parent d7168fa61e
commit db7a4e66e1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Apr 30 16:39:44 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/ipsocket.c (init_inetsock_internal): preserve errno
before other library calls and use rb_syserr_fail.
[ruby-core:68531] [Bug #10975]
Thu Apr 30 16:22:16 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 30 16:22:16 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (lambda): push and reset cmdarg_stack in lambda body. * parse.y (lambda): push and reset cmdarg_stack in lambda body.

8
ext/socket/ipsocket.c
View File

@ -41,6 +41,7 @@ inetsock_cleanup(struct inetsock_arg *arg)
static VALUE static VALUE
init_inetsock_internal(struct inetsock_arg *arg) init_inetsock_internal(struct inetsock_arg *arg)
{ {
int error = 0;
int type = arg->type; int type = arg->type;
struct addrinfo *res, *lres; struct addrinfo *res, *lres;
int fd, status = 0, local = 0; int fd, status = 0, local = 0;
@ -80,6 +81,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
syscall = "socket(2)"; syscall = "socket(2)";
fd = status; fd = status;
if (fd < 0) { if (fd < 0) {
error = errno;
continue; continue;
} }
arg->fd = fd; arg->fd = fd;
@ -107,6 +109,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
} }
if (status < 0) { if (status < 0) {
error = errno;
close(fd); close(fd);
arg->fd = fd = -1; arg->fd = fd = -1;
continue; continue;
@ -124,7 +127,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
port = arg->remote.serv; port = arg->remote.serv;
} }
rsock_sys_fail_host_port(syscall, host, port); rsock_syserr_fail_host_port(error, mesg, host, port);
} }
arg->fd = -1; arg->fd = -1;
@ -132,8 +135,9 @@ init_inetsock_internal(struct inetsock_arg *arg)
if (type == INET_SERVER) { if (type == INET_SERVER) {
status = listen(fd, SOMAXCONN); status = listen(fd, SOMAXCONN);
if (status < 0) { if (status < 0) {
error = errno;
close(fd); close(fd);
rb_sys_fail("listen(2)"); rb_syserr_fail(error, "listen(2)");
} }
} }