From: Jelte Jansen <jelte@isc.org>
Date: Thu, 4 Oct 2012 10:21:04 +0000 (+0200)
Subject: [2275] valgrind fixes: uninitialized memory
X-Git-Tag: trac2402_base~15^2~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c4ec91a6f44300af78f4964496cf000c97e93f8;p=thirdparty%2Fkea.git

[2275] valgrind fixes: uninitialized memory
---

diff --git a/src/lib/server_common/tests/socket_requestor_test.cc b/src/lib/server_common/tests/socket_requestor_test.cc
index 9878c632be..1ee9178e7c 100644
--- a/src/lib/server_common/tests/socket_requestor_test.cc
+++ b/src/lib/server_common/tests/socket_requestor_test.cc
@@ -410,6 +410,7 @@ private:
             isc_throw(Unexpected,
                       "mkstemp() created a filename too long for sun_path");
         }
+        memset(socket_address.sun_path, 0, sizeof(socket_address.sun_path));
         strncpy(socket_address.sun_path, path_, len);
 #ifdef HAVE_SA_LEN
         socket_address.sun_len = len;
@@ -542,7 +543,6 @@ TEST_F(SocketRequestorTest, testSocketPassing) {
         EXPECT_EQ("foo", socket_id.second);
         EXPECT_EQ(0, close(socket_id.first));
     }
-
     // Create a second socket server, to test that multiple different
     // domains sockets would work as well (even though we don't actually
     // use that feature)
diff --git a/src/lib/util/io/fd_share.cc b/src/lib/util/io/fd_share.cc
index 7adbbbe9fa..04a3e546fa 100644
--- a/src/lib/util/io/fd_share.cc
+++ b/src/lib/util/io/fd_share.cc
@@ -142,6 +142,7 @@ send_fd(const int sock, const int fd) {
     if (msghdr.msg_control == NULL) {
         return (FD_OTHER_ERROR);
     }
+    memset(msghdr.msg_control, 0, msghdr.msg_controllen);
 
     struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msghdr);
     cmsg->cmsg_len = cmsg_len(sizeof(int));