From 94fd369de75594862ced67c7965b97a4ffcde47e Mon Sep 17 00:00:00 2001 From: david Date: Sat, 26 Jan 2013 05:31:31 +0000 Subject: [PATCH] Clear the sockaddr_in before filling it in. --- TargetGroup.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TargetGroup.cc b/TargetGroup.cc index 83399e9c4..d8e0c9ab3 100644 --- a/TargetGroup.cc +++ b/TargetGroup.cc @@ -295,6 +295,7 @@ bool NetBlockIPv4Ranges::next(struct sockaddr_storage *ss) { } /* Assign the returned address based on current counters. */ + memset(ss, 0, sizeof(*ss)); sin = (struct sockaddr_in *) ss; sin->sin_family = AF_INET; sin->sin_port = 0; @@ -456,9 +457,8 @@ bool NetBlockIPv6Netmask::next(struct sockaddr_storage *ss) { if (this->exhausted) return false; + memset(ss, 0, sizeof(*ss)); sin6 = (struct sockaddr_in6 *) ss; - memset(sin6, 0, sizeof(*sin6)); - sin6->sin6_family = AF_INET6; #ifdef SIN_LEN sin6->sin6_len = sizeof(*sin6);