From 47e57bfab40ba681edf47e136474fe30db2dab73 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 12 Oct 2010 13:28:12 +1100
Subject: [PATCH]  - (djm) [canohost.c] Zero a4 instead of addr to better match
 type.    bz#1825, reported by foo AT mailinator.com

---
 ChangeLog  | 4 ++++
 canohost.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 001b8bc20..0f6b2c91d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20101011
+ - (djm) [canohost.c] Zero a4 instead of addr to better match type.
+   bz#1825, reported by foo AT mailinator.com
+
 20101011
  - (djm) [configure.ac] Use = instead of == in shell tests. Patch from
    dr AT vasco.com
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)
 	memcpy(&inaddr, ((char *)&a6->sin6_addr) + 12, sizeof(inaddr));
 	port = a6->sin6_port;
 
-	memset(addr, 0, sizeof(*a4));
+	bzero(a4, sizeof(*a4));
 
 	a4->sin_family = AF_INET;
 	*len = sizeof(*a4);