diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-10 15:39:16 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-10 15:39:16 +0000 |
| commit | be25c48638a0ba5d619e28fe67defc8e23078317 (patch) | |
| tree | 9194a931423e3ff0dd34de8e64a000cc07aa3f2d | |
| parent | 2ee08591190bed1f57a43a5cdd6486e3abfa664f (diff) | |
| download | ruby-be25c48638a0ba5d619e28fe67defc8e23078317.tar.gz | |
* ext/socket/socket.c (sock_gethostname): use HOST_NAME_MAX.
* ext/socket/raddrinfo.c (make_ipaddr): local variable renamed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 6 | ||||
| -rw-r--r-- | ext/socket/socket.c | 5 |
3 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Feb 11 00:38:16 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/socket.c (sock_gethostname): use HOST_NAME_MAX. + + * ext/socket/raddrinfo.c (make_ipaddr): local variable renamed. + Tue Feb 10 23:44:53 2009 Tanaka Akira <akr@fsij.org> * ext/socket/init.c (struct recvfrom_arg): use struct diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 821265e360..29bcae1e21 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 abce61307a..33b47451fd 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) |