]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[2275] valgrind fixes: uninitialized memory
authorJelte Jansen <jelte@isc.org>
Thu, 4 Oct 2012 10:21:04 +0000 (12:21 +0200)
committerJINMEI Tatuya <jinmei@isc.org>
Thu, 11 Oct 2012 17:04:26 +0000 (10:04 -0700)
src/lib/server_common/tests/socket_requestor_test.cc
src/lib/util/io/fd_share.cc

index 9878c632be747981a834a1dadcf6ddb5451eba2e..1ee9178e7c13451cda6f3b4d5c7ae67bff8ebc5a 100644 (file)
@@ -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)
index 7adbbbe9fa362fef9067ed1866c31a4224dd93d9..04a3e546fa838e0b4d2b82ca87d39def229818e4 100644 (file)
@@ -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));