From a1ed445b812d8aa335700c0bda5e3bd70cc33d20 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Jan 2013 00:32:05 +0000
Subject: * ext/socket/socket.c (sock_s_pack_sockaddr_un): calculate the  
 correct address length of an abstract socket.

* test/socket/test_unix.rb: related test.

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

(limited to 'ext')

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 09c22d6d69..6900dbcca6 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1430,7 +1430,7 @@ sock_s_pack_sockaddr_un(VALUE self, VALUE path)
             (size_t)RSTRING_LEN(path), sizeof(sockaddr.sun_path));
     }
     memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
-    addr = rb_str_new((char*)&sockaddr, sizeof(sockaddr));
+    addr = rb_str_new((char*)&sockaddr, rsock_unix_sockaddr_len(path));
     OBJ_INFECT(addr, path);
 
     return addr;
-- 
cgit v1.2.3