mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Andrews
2010-03-12 03:22:57 +00:00
parent f3c46d66e3
commit ff9301990d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
2865. [bug] memset to zero event.data. [RT #20986]
2864. [bug] Direct SIG/RRSIG queries were not handled correctly. 2864. [bug] Direct SIG/RRSIG queries were not handled correctly.
[RT #21050] [RT #21050]

4
lib/isc/unix/socket.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 */ /*! \file */
@@ -806,6 +806,7 @@ watch_fd(isc__socketmgr_t *manager, int fd, int msg) {
event.events = EPOLLIN; event.events = EPOLLIN;
else else
event.events = EPOLLOUT; event.events = EPOLLOUT;
memset(&event.data, 0, sizeof(event.data));
event.data.fd = fd; event.data.fd = fd;
if (epoll_ctl(manager->epoll_fd, EPOLL_CTL_ADD, fd, &event) == -1 && if (epoll_ctl(manager->epoll_fd, EPOLL_CTL_ADD, fd, &event) == -1 &&
errno != EEXIST) { errno != EEXIST) {
@@ -873,6 +874,7 @@ unwatch_fd(isc__socketmgr_t *manager, int fd, int msg) {
event.events = EPOLLIN; event.events = EPOLLIN;
else else
event.events = EPOLLOUT; event.events = EPOLLOUT;
memset(&event.data, 0, sizeof(event.data));
event.data.fd = fd; event.data.fd = fd;
if (epoll_ctl(manager->epoll_fd, EPOLL_CTL_DEL, fd, &event) == -1 && if (epoll_ctl(manager->epoll_fd, EPOLL_CTL_DEL, fd, &event) == -1 &&
errno != ENOENT) { errno != ENOENT) {