diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-30 12:01:51 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-30 12:01:51 +0000 |
| commit | 1ff38a5bbf2baa5fa6646fffdc81ed3611be805b (patch) | |
| tree | b87a16f878ac955f6a23011223f596170441b9d9 /ext/socket/init.c | |
| parent | 111b86142280d3257021d142fce1317b44c1b850 (diff) | |
* ext/socket/basicsocket.c (bsock_getsockname): ignore truncated
part of socket address.
(bsock_getpeername): ditto.
(bsock_local_address): ditto.
(bsock_remote_address): ditto.
* ext/socket/unixsocket.c (unix_path): ditto.
(unix_addr): ditto.
(unix_peeraddr): ditto.
* ext/socket/init.c (cloexec_accept): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/init.c')
| -rw-r--r-- | ext/socket/init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/socket/init.c b/ext/socket/init.c index 696b62d82a..43d21cc42f 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -481,6 +481,8 @@ static int cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len) { int ret; + socklen_t len0 = 0; + if (address_len) len0 = *address_len; #ifdef HAVE_ACCEPT4 static int try_accept4 = 1; if (try_accept4) { @@ -489,6 +491,7 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len) if (ret != -1) { if (ret <= 2) rb_maygvl_fd_fix_cloexec(ret); + if (address_len && len0 < *address_len) *address_len = len0; return ret; } if (errno == ENOSYS) { @@ -503,6 +506,7 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len) ret = accept(socket, address, address_len); #endif if (ret == -1) return -1; + if (address_len && len0 < *address_len) *address_len = len0; rb_maygvl_fd_fix_cloexec(ret); return ret; } |