From d5dbc0ccb17333dd344f5b70869c6f1f5b769b88 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 10 Feb 2009 15:39:16 +0000 Subject: * ext/socket/socket.c (sock_gethostname): use HOST_NAME_MAX. * ext/socket/raddrinfo.c (make_ipaddr): local variable renamed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/raddrinfo.c | 6 +++--- ext/socket/socket.c | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'ext/socket') diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 821265e36..29bcae1e2 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -193,10 +193,10 @@ make_ipaddr0(struct sockaddr *addr, char *buf, size_t len) VALUE make_ipaddr(struct sockaddr *addr) { - char buf[1024]; + char hbuf[1024]; - make_ipaddr0(addr, buf, sizeof(buf)); - return rb_str_new2(buf); + make_ipaddr0(addr, hbuf, sizeof(hbuf)); + return rb_str_new2(hbuf); } static void diff --git a/ext/socket/socket.c b/ext/socket/socket.c index abce61307..33b47451f 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -826,7 +826,10 @@ sock_sysaccept(VALUE sock) static VALUE sock_gethostname(VALUE obj) { - char buf[1024]; +#ifndef HOST_NAME_MAX +# define HOST_NAME_MAX 1024 +#endif + char buf[HOST_NAME_MAX+1]; rb_secure(3); if (gethostname(buf, (int)sizeof buf - 1) < 0) -- cgit