* ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject

  non-AF_INET/AF_INET6 sockaddr.
  (sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
  [ruby-dev:28691]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 0 deletions

diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index 954a748b86..4eab094e7c 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -72,3 +72,12 @@ class TestBasicSocket < Test::Unit::TestCase
     end
   end
 end if defined?(Socket)
+
+class TestSocket < Test::Unit::TestCase
+  def test_unpack_sockaddr
+    sockaddr_in = Socket.sockaddr_in(80, "")
+    assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(sockaddr_in) }
+    sockaddr_un = Socket.sockaddr_un("/tmp/s")
+    assert_raise(ArgumentError) { Socket.unpack_sockaddr_in(sockaddr_un) }
+  end
+end