ruby-changes:34429
From: usa <ko1@a...>
Date: Mon, 23 Jun 2014 17:25:57 +0900 (JST)
Subject: [ruby-changes:34429] usa:r46510 (ruby_2_0_0): merge revision(s) 39239, 45045, 45530: [Backport #9697]
usa 2014-06-23 17:25:41 +0900 (Mon, 23 Jun 2014) New Revision: 46510 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46510 Log: 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] Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/ext/socket/init.c branches/ruby_2_0_0/ext/socket/ipsocket.c branches/ruby_2_0_0/ext/socket/raddrinfo.c branches/ruby_2_0_0/ext/socket/rubysocket.h branches/ruby_2_0_0/ext/socket/socket.c branches/ruby_2_0_0/ext/socket/tcpsocket.c branches/ruby_2_0_0/version.h Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 46509) +++ ruby_2_0_0/ChangeLog (revision 46510) @@ -1,3 +1,46 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Mon Jun 23 17:20:10 2014 Tanaka Akira <akr@f...> + + * 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] + +Mon Jun 23 17:20:10 2014 Tanaka Akira <akr@f...> + + * ext/socket/ipsocket.c (ip_s_getaddress): Don't access freed memory. + +Mon Jun 23 17:20:10 2014 Tanaka Akira <akr@f...> + + * 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. + Mon Jun 23 16:55:13 2014 Nobuyoshi Nakada <nobu@r...> * parse.y (primary): flush cmdarg flags inside left-paren in a Index: ruby_2_0_0/ext/socket/tcpsocket.c =================================================================== --- ruby_2_0_0/ext/socket/tcpsocket.c (revision 46509) +++ ruby_2_0_0/ext/socket/tcpsocket.c (revision 46510) @@ -34,7 +34,7 @@ tcp_init(int argc, VALUE *argv, VALUE so https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/tcpsocket.c#L34 static VALUE tcp_sockaddr(struct sockaddr *addr, size_t len) { - return rsock_make_ipaddr(addr); + return rsock_make_ipaddr(addr, len); } /* Index: ruby_2_0_0/ext/socket/rubysocket.h =================================================================== --- ruby_2_0_0/ext/socket/rubysocket.h (revision 46509) +++ ruby_2_0_0/ext/socket/rubysocket.h (revision 46510) @@ -231,8 +231,8 @@ VALUE rsock_io_socket_addrinfo(VALUE io, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/rubysocket.h#L231 VALUE rsock_addrinfo_new(struct sockaddr *addr, socklen_t len, int family, int socktype, int protocol, VALUE canonname, VALUE inspectname); -VALUE rsock_make_ipaddr(struct sockaddr *addr); -VALUE rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup); +VALUE rsock_make_ipaddr(struct sockaddr *addr, socklen_t addrlen); +VALUE rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup); VALUE rsock_make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, size_t)); int rsock_revlookup_flag(VALUE revlookup, int *norevlookup); Index: ruby_2_0_0/ext/socket/init.c =================================================================== --- ruby_2_0_0/ext/socket/init.c (revision 46509) +++ ruby_2_0_0/ext/socket/init.c (revision 46510) @@ -155,7 +155,7 @@ rsock_s_recvfrom(VALUE sock, int argc, V https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/init.c#L155 } #endif if (arg.alen && arg.alen != sizeof(arg.buf)) /* OSX doesn't return a from result for connection-oriented sockets */ - return rb_assoc_new(str, rsock_ipaddr((struct sockaddr*)&arg.buf, fptr->mode & FMODE_NOREVLOOKUP)); + return rb_assoc_new(str, rsock_ipaddr((struct sockaddr*)&arg.buf, arg.alen, fptr->mode & FMODE_NOREVLOOKUP)); else return rb_assoc_new(str, Qnil); @@ -227,7 +227,7 @@ rsock_s_recvfrom_nonblock(VALUE sock, in https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/init.c#L227 case RECV_IP: if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */ - addr = rsock_ipaddr((struct sockaddr*)&buf, fptr->mode & FMODE_NOREVLOOKUP); + addr = rsock_ipaddr((struct sockaddr*)&buf, alen, fptr->mode & FMODE_NOREVLOOKUP); break; case RECV_SOCKET: Index: ruby_2_0_0/ext/socket/raddrinfo.c =================================================================== --- ruby_2_0_0/ext/socket/raddrinfo.c (revision 46509) +++ ruby_2_0_0/ext/socket/raddrinfo.c (revision 46510) @@ -237,27 +237,27 @@ rb_getnameinfo(const struct sockaddr *sa https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L237 } static void -make_ipaddr0(struct sockaddr *addr, char *buf, size_t len) +make_ipaddr0(struct sockaddr *addr, socklen_t addrlen, char *buf, size_t buflen) { int error; - error = rb_getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST); + error = rb_getnameinfo(addr, addrlen, buf, buflen, NULL, 0, NI_NUMERICHOST); if (error) { rsock_raise_socket_error("getnameinfo", error); } } VALUE -rsock_make_ipaddr(struct sockaddr *addr) +rsock_make_ipaddr(struct sockaddr *addr, socklen_t addrlen) { char hbuf[1024]; - make_ipaddr0(addr, hbuf, sizeof(hbuf)); + make_ipaddr0(addr, addrlen, hbuf, sizeof(hbuf)); return rb_str_new2(hbuf); } static void -make_inetaddr(unsigned int host, char *buf, size_t len) +make_inetaddr(unsigned int host, char *buf, size_t buflen) { struct sockaddr_in sin; @@ -265,7 +265,7 @@ make_inetaddr(unsigned int host, char *b https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L265 sin.sin_family = AF_INET; SET_SIN_LEN(&sin, sizeof(sin)); sin.sin_addr.s_addr = host; - make_ipaddr0((struct sockaddr*)&sin, buf, len); + make_ipaddr0((struct sockaddr*)&sin, sizeof(sin), buf, buflen); } static int @@ -284,7 +284,7 @@ str_is_number(const char *p) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L284 } static char* -host_str(VALUE host, char *hbuf, size_t len, int *flags_ptr) +host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr) { if (NIL_P(host)) { return NULL; @@ -292,7 +292,7 @@ host_str(VALUE host, char *hbuf, size_t https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L292 else if (rb_obj_is_kind_of(host, rb_cInteger)) { unsigned int i = NUM2UINT(host); - make_inetaddr(htonl(i), hbuf, len); + make_inetaddr(htonl(i), hbuf, hbuflen); if (flags_ptr) *flags_ptr |= AI_NUMERICHOST; return hbuf; } @@ -302,14 +302,14 @@ host_str(VALUE host, char *hbuf, size_t https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L302 SafeStringValue(host); name = RSTRING_PTR(host); if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) { - make_inetaddr(INADDR_ANY, hbuf, len); + make_inetaddr(INADDR_ANY, hbuf, hbuflen); if (flags_ptr) *flags_ptr |= AI_NUMERICHOST; } else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) { - make_inetaddr(INADDR_BROADCAST, hbuf, len); + make_inetaddr(INADDR_BROADCAST, hbuf, hbuflen); if (flags_ptr) *flags_ptr |= AI_NUMERICHOST; } - else if (strlen(name) >= len) { + else if (strlen(name) >= hbuflen) { rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")", strlen(name)); } @@ -321,13 +321,13 @@ host_str(VALUE host, char *hbuf, size_t https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L321 } static char* -port_str(VALUE port, char *pbuf, size_t len, int *flags_ptr) +port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr) { if (NIL_P(port)) { return 0; } else if (FIXNUM_P(port)) { - snprintf(pbuf, len, "%ld", FIX2LONG(port)); + snprintf(pbuf, pbuflen, "%ld", FIX2LONG(port)); #ifdef AI_NUMERICSERV if (flags_ptr) *flags_ptr |= AI_NUMERICSERV; #endif @@ -338,7 +338,7 @@ port_str(VALUE port, char *pbuf, size_t https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L338 SafeStringValue(port); serv = RSTRING_PTR(port); - if (strlen(serv) >= len) { + if (strlen(serv) >= pbuflen) { rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")", strlen(serv)); } @@ -388,7 +388,7 @@ rsock_addrinfo(VALUE host, VALUE port, i https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L388 } VALUE -rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup) +rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup) { VALUE family, port, addr1, addr2; VALUE ary; @@ -407,13 +407,13 @@ rsock_ipaddr(struct sockaddr *sockaddr, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L407 addr1 = Qnil; if (!norevlookup) { - error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf), + error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf), NULL, 0, 0); if (! error) { addr1 = rb_str_new2(hbuf); } } - error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf), + error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV); if (error) { rsock_raise_socket_error("getnameinfo", error); Index: ruby_2_0_0/ext/socket/ipsocket.c =================================================================== --- ruby_2_0_0/ext/socket/ipsocket.c (revision 46509) +++ ruby_2_0_0/ext/socket/ipsocket.c (revision 46510) @@ -194,7 +194,7 @@ ip_addr(int argc, VALUE *argv, VALUE soc https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/ipsocket.c#L194 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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/ipsocket.c#L235 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) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/ipsocket.c#L280 { 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 Index: ruby_2_0_0/ext/socket/socket.c =================================================================== --- ruby_2_0_0/ext/socket/socket.c (revision 46509) +++ ruby_2_0_0/ext/socket/socket.c (revision 46510) @@ -937,7 +937,7 @@ make_addrinfo(struct addrinfo *res0, int https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/socket.c#L937 } base = rb_ary_new(); for (res = res0; res; res = res->ai_next) { - ary = rsock_ipaddr(res->ai_addr, norevlookup); + ary = rsock_ipaddr(res->ai_addr, res->ai_addrlen, norevlookup); if (res->ai_canonname) { RARRAY_PTR(ary)[2] = rb_str_new2(res->ai_canonname); } @@ -1216,9 +1216,10 @@ sock_s_getnameinfo(int argc, VALUE *argv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/socket.c#L1216 char hbuf[1024], pbuf[1024]; int fl; struct addrinfo hints, *res = NULL, *r; - int error; + int error, saved_errno; struct sockaddr_storage ss; struct sockaddr *sap; + socklen_t salen; sa = flags = Qnil; rb_scan_args(argc, argv, "11", &sa, &flags); @@ -1238,6 +1239,7 @@ sock_s_getnameinfo(int argc, VALUE *argv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/socket.c#L1239 rb_raise(rb_eTypeError, "sockaddr size differs - should not happen"); } sap = (struct sockaddr*)&ss; + salen = RSTRING_LEN(sa); goto call_nameinfo; } tmp = rb_check_array_type(sa); @@ -1299,13 +1301,14 @@ sock_s_getnameinfo(int argc, VALUE *argv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/socket.c#L1301 error = rb_getaddrinfo(hptr, pptr, &hints, &res); if (error) goto error_exit_addr; sap = res->ai_addr; + salen = res->ai_addrlen; } else { rb_raise(rb_eTypeError, "expecting String or Array"); } call_nameinfo: - error = rb_getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf), + error = rb_getnameinfo(sap, salen, hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), fl); if (error) goto error_exit_name; if (res) { @@ -1313,7 +1316,8 @@ sock_s_getnameinfo(int argc, VALUE *argv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/socket.c#L1316 char hbuf2[1024], pbuf2[1024]; sap = r->ai_addr; - error = rb_getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2), + salen = r->ai_addrlen; + error = rb_getnameinfo(sap, salen, hbuf2, sizeof(hbuf2), pbuf2, sizeof(pbuf2), fl); if (error) goto error_exit_name; if (strcmp(hbuf, hbuf2) != 0|| strcmp(pbuf, pbuf2) != 0) { @@ -1326,11 +1330,15 @@ sock_s_getnameinfo(int argc, VALUE *argv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/socket.c#L1330 return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf)); error_exit_addr: + saved_errno = errno; if (res) freeaddrinfo(res); + errno = saved_errno; rsock_raise_socket_error("getaddrinfo", error); error_exit_name: + saved_errno = errno; if (res) freeaddrinfo(res); + errno = saved_errno; rsock_raise_socket_error("getnameinfo", error); UNREACHABLE; @@ -1399,7 +1407,7 @@ sock_s_unpack_sockaddr_in(VALUE self, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/socket.c#L1407 rb_raise(rb_eArgError, "not an AF_INET sockaddr"); #endif } - host = rsock_make_ipaddr((struct sockaddr*)sockaddr); + host = rsock_make_ipaddr((struct sockaddr*)sockaddr, RSTRING_LEN(addr)); OBJ_INFECT(host, addr); return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host); } Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 46509) +++ ruby_2_0_0/version.h (revision 46510) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-06-23" -#define RUBY_PATCHLEVEL 492 +#define RUBY_PATCHLEVEL 493 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 6 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r39239,45045,45530 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/