From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 22 Aug 2007 04:02:53 +0000 (+0000)
Subject: [BZ #4726]
X-Git-Tag: cvs/fedora-glibc-20070825T1839~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f8f993ceff73bef51763d0b8addd29b86fad061;p=thirdparty%2Fglibc.git

[BZ #4726]

	* resolv/res_send.c (__libc_res_nsend): Initialize all of the
	memory allocated for the name server address.
---

diff --git a/ChangeLog b/ChangeLog
index e42f82e5d37..1ede0e9225a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-21  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #4726]
+	* resolv/res_send.c (__libc_res_nsend): Initialize all of the
+	memory allocated for the name server address.
+
 	[BZ #4946]
 	* nscd/connections.c (handle_request): Using sendfile always
 	requires that mmap is used for the database.
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 27dd1d4351f..23306a2fb47 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -425,9 +425,12 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
 				EXT(statp).nsaddrs[n] =
 				    malloc(sizeof (struct sockaddr_in6));
 			if (EXT(statp).nsaddrs[n] != NULL) {
-				memcpy(EXT(statp).nsaddrs[n],
-				       &statp->nsaddr_list[ns],
-				       sizeof (struct sockaddr_in));
+				memset (mempcpy(EXT(statp).nsaddrs[n],
+						&statp->nsaddr_list[ns],
+						sizeof (struct sockaddr_in)),
+					'\0',
+					sizeof (struct sockaddr_in6)
+					- sizeof (struct sockaddr_in));
 				EXT(statp).nssocks[n] = -1;
 				n++;
 			}