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/unixsocket.c | |
| parent | 111b86142280d3257021d142fce1317b44c1b850 (diff) | |
| download | ruby-1ff38a5bbf2baa5fa6646fffdc81ed3611be805b.tar.gz | |
* 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/unixsocket.c')
| -rw-r--r-- | ext/socket/unixsocket.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 84dcacd98d..75da9c1a78 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -120,8 +120,10 @@ unix_path(VALUE sock) if (NIL_P(fptr->pathv)) { struct sockaddr_un addr; socklen_t len = (socklen_t)sizeof(addr); + socklen_t len0 = len; if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0) rb_sys_fail(0); + if (len0 < len) len = len0; fptr->pathv = rb_obj_freeze(rsock_unixpath_str(&addr, len)); } return rb_str_dup(fptr->pathv); @@ -424,11 +426,13 @@ unix_addr(VALUE sock) rb_io_t *fptr; struct sockaddr_un addr; socklen_t len = (socklen_t)sizeof addr; + socklen_t len0 = len; GetOpenFile(sock, fptr); if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0) rb_sys_fail("getsockname(2)"); + if (len0 < len) len = len0; return rsock_unixaddr(&addr, len); } @@ -450,11 +454,13 @@ unix_peeraddr(VALUE sock) rb_io_t *fptr; struct sockaddr_un addr; socklen_t len = (socklen_t)sizeof addr; + socklen_t len0 = len; GetOpenFile(sock, fptr); if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0) rb_sys_fail("getpeername(2)"); + if (len0 < len) len = len0; return rsock_unixaddr(&addr, len); } |