2865. [bug] memset to zero event.data. [RT #20986]

diff --git a/CHANGES b/CHANGES
index 0f8b4691d714fc7473596b8f59bca03104da55f9..f97d26433fb0138937fba6031bdd8bde5ef2c776 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2865.  [bug]           memset to zero event.data.  [RT #20986]
+
 2864.  [bug]           Direct SIG/RRSIG queries were not handled correctly.
                        [RT #21050]
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 91bb5b3766c217306e328cf4e49862e171e676f5..d1680572029c22bfd2730ed5ce46bbf4652664c6 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.329 2010/03/11 04:43:57 marka Exp $ */
+/* $Id: socket.c,v 1.330 2010/03/12 03:22:57 marka Exp $ */
 
 /*! \file */
 
@@ -806,6 +806,7 @@ watch_fd(isc__socketmgr_t *manager, int fd, int msg) {
                event.events = EPOLLIN;
        else
                event.events = EPOLLOUT;
+       memset(&event.data, 0, sizeof(event.data));
        event.data.fd = fd;
        if (epoll_ctl(manager->epoll_fd, EPOLL_CTL_ADD, fd, &event) == -1 &&
            errno != EEXIST) {
@@ -873,6 +874,7 @@ unwatch_fd(isc__socketmgr_t *manager, int fd, int msg) {
                event.events = EPOLLIN;
        else
                event.events = EPOLLOUT;
+       memset(&event.data, 0, sizeof(event.data));
        event.data.fd = fd;
        if (epoll_ctl(manager->epoll_fd, EPOLL_CTL_DEL, fd, &event) == -1 &&
            errno != ENOENT) {