From 7d63280c17acff8093b9e909349eafbbab19f8fe Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 9 Feb 2009 10:59:55 +0000
Subject: * ext/socket/basicsocket.c (bsock_getsockopt): refine address family 
  examination.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/basicsocket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'ext/socket/basicsocket.c')

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();
-- 
cgit v1.2.3