* 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/branches/ruby_1_8@10218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 14 insertions, 0 deletions

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index ad6e1d9ca4..7dea26ad49 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -3735,6 +3735,17 @@ sock_s_unpack_sockaddr_in(self, addr)
     VALUE host;
 
     sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
+    if (((struct sockaddr *)sockaddr)->sa_family != AF_INET
+#ifdef INET6
+        && ((struct sockaddr *)sockaddr)->sa_family != AF_INET6
+#endif
+        ) {
+#ifdef INET6
+        rb_raise(rb_eArgError, "not an AF_INET/AF_INET6 sockaddr");
+#else
+        rb_raise(rb_eArgError, "not an AF_INET sockaddr");
+#endif
+    }
     host = make_ipaddr((struct sockaddr*)sockaddr);
     OBJ_INFECT(host, addr);
     return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
@@ -3772,6 +3783,9 @@ sock_s_unpack_sockaddr_un(self, addr)
     VALUE path;
 
     sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
+    if (((struct sockaddr *)sockaddr)->sa_family != AF_UNIX) {
+        rb_raise(rb_eArgError, "not an AF_UNIX sockaddr");
+    }
     if (sizeof(struct sockaddr_un) < RSTRING(addr)->len) {
         rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
 		 RSTRING(addr)->len, sizeof(struct sockaddr_un));