summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--canohost.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 001b8bc20..0f6b2c91d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
120101011 120101011
2 - (djm) [canohost.c] Zero a4 instead of addr to better match type.
3 bz#1825, reported by foo AT mailinator.com
4
520101011
2 - (djm) [configure.ac] Use = instead of == in shell tests. Patch from 6 - (djm) [configure.ac] Use = instead of == in shell tests. Patch from
3 dr AT vasco.com 7 dr AT vasco.com
4 8
diff --git a/canohost.c b/canohost.c
index ef94d9155..dabd8a31a 100644
--- a/canohost.c
+++ b/canohost.c
@@ -199,7 +199,7 @@ ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len)
199 memcpy(&inaddr, ((char *)&a6->sin6_addr) + 12, sizeof(inaddr)); 199 memcpy(&inaddr, ((char *)&a6->sin6_addr) + 12, sizeof(inaddr));
200 port = a6->sin6_port; 200 port = a6->sin6_port;
201 201
202 memset(addr, 0, sizeof(*a4)); 202 bzero(a4, sizeof(*a4));
203 203
204 a4->sin_family = AF_INET; 204 a4->sin_family = AF_INET;
205 *len = sizeof(*a4); 205 *len = sizeof(*a4);