kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/unixsocket.c (unix_send_io): race condition fixed.

Browse source 
(unix_recv_io): ditto.
  fixed by Eric Wong.  [ruby-core:35574]

* test/socket/test_unix.rb: test added for above problem.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-06-13 14:11:23 +00:00
parent 3254c1bf24
commit 9778737d7b
3 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/socket/unixsocket.c
View file

@ -248,9 +248,10 @@ unix_send_io(VALUE sock, VALUE val)
#endif
arg.fd = fptr->fd;
rb_thread_fd_writable(arg.fd);
if ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1)
rb_sys_fail("sendmsg(2)");
while ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1) {
if (!rb_io_wait_writable(arg.fd))
rb_sys_fail("sendmsg(2)");
}
return Qnil;
}
@ -334,9 +335,10 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
#endif
arg.fd = fptr->fd;
rb_thread_wait_fd(arg.fd);
if ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1)
rb_sys_fail("recvmsg(2)");
while ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1) {
if (!rb_io_wait_readable(arg.fd))
rb_sys_fail("recvmsg(2)");
}
#if FD_PASSING_BY_MSG_CONTROL
if (arg.msg.msg_controllen < (socklen_t)sizeof(struct cmsghdr)) {