diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-28 13:29:55 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-28 13:29:55 +0000 |
| commit | 338ec3cee73f58091927d9282070efd0da0cca36 (patch) | |
| tree | de0940cea38db3a6df8085666aa0a5bda1e95eb9 | |
| parent | 9a1d5b04cd8aab74c4a915476d533181058ab21c (diff) | |
* ext/socket/raddrinfo.c (inspect_sockaddr): don't show that Unix
domain socket filename is bigger than sizeof(sun_path).
This limit is not rigid on some platforms such as Darwin and SunOS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 3 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Thu Feb 28 22:23:27 2013 Tanaka Akira <akr@fsij.org> + + * ext/socket/raddrinfo.c (inspect_sockaddr): don't show that Unix + domain socket filename is bigger than sizeof(sun_path). + This limit is not rigid on some platforms such as Darwin and SunOS. + Thu Feb 28 21:33:01 2013 WATANABE Hirofumi <eban@ruby-lang.org> * configure.in(AC_DISABLE_OPTION_CHECKING): avoid warning "WARNING: diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 52169d3ec7..569456cae3 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -1048,9 +1048,6 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret) while (s < e) rb_str_catf(ret, ":%02x", (unsigned char)*s++); } - if (addr->sun_path + sizeof(addr->sun_path) < (char*)&rai->addr + rai->sockaddr_len) - rb_str_catf(ret, "(sockaddr %d bytes too long)", - (int)(rai->sockaddr_len - (addr->sun_path + sizeof(addr->sun_path) - (char*)&rai->addr))); } break; } |