diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-11-07 20:13:25 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-11-10 01:37:12 -0800 |
| commit | 86a321b65dcc5253f61202b2fdaac41f275344ce (patch) | |
| tree | e6dd37093bbab2dad2ae7f2f6175b44bb53d9adb /src/rt/rust_uv.cpp | |
| parent | 3a3eefc5c3ce95de3001d8ee830296345c2f6bc9 (diff) | |
| download | rust-86a321b65dcc5253f61202b2fdaac41f275344ce.tar.gz rust-86a321b65dcc5253f61202b2fdaac41f275344ce.zip | |
Another round of test fixes from previous commits
Diffstat (limited to 'src/rt/rust_uv.cpp')
| -rw-r--r-- | src/rt/rust_uv.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index 280b016af10..f3be486a25a 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -93,8 +93,7 @@ rust_sockaddr_size() { extern "C" struct sockaddr* rust_malloc_ip4_addr(char *name, int port) { - struct sockaddr_in *addr = (struct sockaddr_in*) malloc(sizeof(struct sockaddr_in)); - memset(addr, 0, sizeof(struct sockaddr_in)); + struct sockaddr_in *addr = (struct sockaddr_in*) calloc(1, rust_sockaddr_size()); assert(addr != NULL); addr->sin_port = htons(port); assert(uv_inet_pton(AF_INET, name, &addr->sin_addr) == 0); @@ -104,8 +103,7 @@ rust_malloc_ip4_addr(char *name, int port) { extern "C" struct sockaddr* rust_malloc_ip6_addr(char *name, int port) { - struct sockaddr_in6 *addr = (struct sockaddr_in6*) malloc(sizeof(struct sockaddr_in6)); - memset(addr, 0, sizeof(struct sockaddr)); + struct sockaddr_in6 *addr = (struct sockaddr_in6*) calloc(1, rust_sockaddr_size()); assert(addr != NULL); addr->sin6_port = htons(port); assert(uv_inet_pton(AF_INET6, name, &addr->sin6_addr) == 0); |