diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-20 13:22:44 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-20 13:22:44 +0000 |
| commit | 81dfa8b397d901aad66da29a1fc2ce05f66485f9 (patch) | |
| tree | cdd11cdb18fd02133c208cfc76eb6cbe90c17db8 /ext/socket/raddrinfo.c | |
| parent | 13834fb3cb8c89c647f1f05439e940d45c46fb69 (diff) | |
* ext/socket/raddrinfo.c (numeric_getaddrinfo): Use xcalloc.
Suggested by Eric Wong.
https://bugs.ruby-lang.org/issues/9525#note-14
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/raddrinfo.c')
| -rw-r--r-- | ext/socket/raddrinfo.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 3eb92dabb9..b5622738f3 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -203,9 +203,8 @@ numeric_getaddrinfo(const char *node, const char *service, for (i = numberof(list)-1; 0 <= i; i--) { if ((hint_socktype == 0 || hint_socktype == list[i].socktype) && (hint_protocol == 0 || list[i].protocol == 0 || hint_protocol == list[i].protocol)) { - struct addrinfo *ai0 = xmalloc(sizeof(struct addrinfo)); + struct addrinfo *ai0 = xcalloc(1, sizeof(struct addrinfo)); struct sockaddr_in6 *sa = xmalloc(sizeof(struct sockaddr_in6)); - MEMZERO(ai0, sizeof(struct addrinfo), 1); INIT_SOCKADDR_IN6(sa, sizeof(struct sockaddr_in6)); memcpy(&sa->sin6_addr, ipv6addr, sizeof(ipv6addr)); sa->sin6_port = htons(port); @@ -229,9 +228,8 @@ numeric_getaddrinfo(const char *node, const char *service, for (i = numberof(list)-1; 0 <= i; i--) { if ((hint_socktype == 0 || hint_socktype == list[i].socktype) && (hint_protocol == 0 || list[i].protocol == 0 || hint_protocol == list[i].protocol)) { - struct addrinfo *ai0 = xmalloc(sizeof(struct addrinfo)); + struct addrinfo *ai0 = xcalloc(1, sizeof(struct addrinfo)); struct sockaddr_in *sa = xmalloc(sizeof(struct sockaddr_in)); - MEMZERO(ai0, sizeof(struct addrinfo), 1); INIT_SOCKADDR_IN(sa, sizeof(struct sockaddr_in)); memcpy(&sa->sin_addr, ipv4addr, sizeof(ipv4addr)); sa->sin_port = htons(port); |