From 0fcc2cdb99264e196846155617f14e503ac951fc Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 23 Jun 2014 08:25:41 +0000 Subject: merge revision(s) 39239,45045,45530: [Backport #9697] * ext/socket: always operate length of socket addess companion with socket address. * ext/socket/rubysocket.h (rsock_make_ipaddr): add an argument for socket address length. (rsock_ipaddr): ditto. * ext/socket/ipsocket.c (ip_addr): pass length to rsock_ipaddr. (ip_peeraddr): ditto. (ip_s_getaddress): pass length to rsock_make_ipaddr. * ext/socket/socket.c (make_addrinfo): pass length to rsock_ipaddr. (sock_s_getnameinfo): pass actual address length to rb_getnameinfo. (sock_s_unpack_sockaddr_in): pass length to rsock_make_ipaddr. * ext/socket/init.c (rsock_s_recvfrom): pass length to rsock_ipaddr. (rsock_s_recvfrom_nonblock): ditto. * ext/socket/tcpsocket.c (tcp_sockaddr): pass length to rsock_make_ipaddr. * ext/socket/raddrinfo.c (make_ipaddr0): add an argument for socket address length. pass the length to rb_getnameinfo. (rsock_ipaddr): ditto. (rsock_make_ipaddr): add an argument for socket address length. pass the length to make_ipaddr0. (make_inetaddr): pass length to make_ipaddr0. a local variable renamed. (host_str): a local variable renamed. (port_str): ditto. * ext/socket/ipsocket.c (ip_s_getaddress): Don't access freed memory. * ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM. Reported by Saravana kumar. [ruby-core:61820] [Bug #9697] Fixed by Heesob Park. [ruby-core:61868] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/ipsocket.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ext/socket/ipsocket.c') diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c index b1085cd70c..fa5c13c08f 100644 --- a/ext/socket/ipsocket.c +++ b/ext/socket/ipsocket.c @@ -194,7 +194,7 @@ ip_addr(int argc, VALUE *argv, VALUE sock) norevlookup = fptr->mode & FMODE_NOREVLOOKUP; if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0) rb_sys_fail("getsockname(2)"); - return rsock_ipaddr((struct sockaddr*)&addr, norevlookup); + return rsock_ipaddr((struct sockaddr*)&addr, len, norevlookup); } /* @@ -235,7 +235,7 @@ ip_peeraddr(int argc, VALUE *argv, VALUE sock) norevlookup = fptr->mode & FMODE_NOREVLOOKUP; if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0) rb_sys_fail("getpeername(2)"); - return rsock_ipaddr((struct sockaddr*)&addr, norevlookup); + return rsock_ipaddr((struct sockaddr*)&addr, len, norevlookup); } /* @@ -280,12 +280,13 @@ ip_s_getaddress(VALUE obj, VALUE host) { struct sockaddr_storage addr; struct addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0); + socklen_t len = res->ai_addrlen; /* just take the first one */ - memcpy(&addr, res->ai_addr, res->ai_addrlen); + memcpy(&addr, res->ai_addr, len); freeaddrinfo(res); - return rsock_make_ipaddr((struct sockaddr*)&addr); + return rsock_make_ipaddr((struct sockaddr*)&addr, len); } void -- cgit v1.2.3