diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/socket.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 0d0b4b3d06..a5d486a68e 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -3512,6 +3512,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); @@ -3549,6 +3560,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)); |