From 9778737d7b2a870ff195f318cceb48b93e661f03 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 13 Jun 2011 14:11:23 +0000 Subject: * ext/socket/unixsocket.c (unix_send_io): race condition fixed. (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 --- ext/socket/unixsocket.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'ext/socket/unixsocket.c') diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 5a8641acc2..88ffa60fb6 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -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)) { -- cgit v1.2.3