diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-23 08:13:37 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-23 08:13:37 +0000 |
| commit | 2bcd502a71bc0a140f3b78ed0d148745fb648555 (patch) | |
| tree | 45728da77bd3fb3308b21394f6f0aec15be24f9b /ext/socket/unixsocket.c | |
| parent | c93ed570a2991f5ec059526941f442eadacc3cb1 (diff) | |
| download | ruby-2bcd502a71bc0a140f3b78ed0d148745fb648555.tar.gz | |
* io.c (rb_update_max_fd): validate fd.
* ext/socket/rubysocket.h (rsock_discard_cmsg_resource): add
msg_peek_p argument for the declaration.
* ext/socket/ancdata.c (discard_cmsg): add msg_peek_p argument.
assume FreeBSD, NetBSD and MacOS X doesn't generate passed fd
when MSG_PEEK.
(rsock_discard_cmsg_resource): add msg_peek_p argument.
(bsock_recvmsg_internal): call rsock_discard_cmsg_resource with
msg_peek_p argument.
* ext/socket/unixsocket.c (unix_recv_io): call
rsock_discard_cmsg_resource with msg_peek_p argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/unixsocket.c')
| -rw-r--r-- | ext/socket/unixsocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 587caf88a0..f29724db25 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -367,7 +367,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock) (int)arg.msg.msg_controllen, (int)CMSG_SPACE(sizeof(int))); } if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) { - rsock_discard_cmsg_resource(&arg.msg); + rsock_discard_cmsg_resource(&arg.msg, 0); rb_raise(rb_eSocket, "file descriptor was not passed (cmsg_len=%d, %d expected)", (int)cmsg.hdr.cmsg_len, (int)CMSG_LEN(sizeof(int))); |