diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/socket/socket.c | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Apr 7 21:11:49 2014 Tanaka Akira <akr@fsij.org> + + * 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 Apr 7 07:20:23 2014 NARUSE, Yui <naruse@ruby-lang.org> * lib/xmlrpc/client.rb (do_rpc): don't check body length. diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 67bfcb3031..6b145acfc5 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1346,7 +1346,7 @@ sock_s_getnameinfo(int argc, VALUE *argv) int fl; struct rb_addrinfo *res = NULL; struct addrinfo hints, *r; - int error; + int error, saved_errno; union_sockaddr ss; struct sockaddr *sap; socklen_t salen; @@ -1460,11 +1460,15 @@ sock_s_getnameinfo(int argc, VALUE *argv) return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf)); error_exit_addr: + saved_errno = errno; if (res) rb_freeaddrinfo(res); + errno = saved_errno; rsock_raise_socket_error("getaddrinfo", error); error_exit_name: + saved_errno = errno; if (res) rb_freeaddrinfo(res); + errno = saved_errno; rsock_raise_socket_error("getnameinfo", error); UNREACHABLE; |