diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/basicsocket.c | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Feb 9 19:59:18 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/basicsocket.c (bsock_getsockopt): refine address family + examination. + Mon Feb 9 19:52:32 2009 Tanaka Akira <akr@fsij.org> * ext/socket/option.c (sockopt_initialize): argument conversion diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c index 65c19d00ee..fdd2ce7221 100644 --- a/ext/socket/basicsocket.c +++ b/ext/socket/basicsocket.c @@ -300,14 +300,13 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname) GetOpenFile(sock, fptr); + ss.ss_family = AF_UNSPEC; if (getsockname(fptr->fd, (struct sockaddr*)&ss, &sslen) < 0) rb_sys_fail("getsockname(2)"); if (getsockopt(fptr->fd, level, option, buf, &len) < 0) rb_sys_fail_path(fptr->pathv); - if (sslen < (char*)&ss.ss_family + sizeof(ss.ss_family) - (char*)&ss) - ss.ss_family = AF_UNSPEC; return sockopt_new(ss.ss_family, level, option, rb_str_new(buf, len)); #else rb_notimplement(); |