Project

General

Profile

« Previous | Next » 

Revision 0fcc2cdb

Added by usa (Usaku NAKAMURA) almost 10 years ago

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