source: vendor/3.6.23/examples/bind9-patches/0002-prevent-a-valgrind-uninitialised-memory-warning.patch

Last change on this file was 740, checked in by Silvan Scherrer, 13 years ago

Samba Server: update vendor to 3.6.0

File size: 1.2 KB
Line 
1From 31059dee4a706bb4f25f3dccaae7616451eabd8b Mon Sep 17 00:00:00 2001
2From: Andrew Tridgell <tridge@samba.org>
3Date: Wed, 17 Feb 2010 10:59:42 +1100
4Subject: [PATCH 2/5] prevent a valgrind uninitialised memory warning
5
6epoll uses a union, so to prevent passing uninitialised data in a
7syscall we need to zero it before use.
8---
9 lib/isc/unix/socket.c | 2 ++
10 1 files changed, 2 insertions(+), 0 deletions(-)
11
12diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
13index d09fe51..4796ee4 100644
14--- a/lib/isc/unix/socket.c
15+++ b/lib/isc/unix/socket.c
16@@ -652,6 +652,7 @@ watch_fd(isc_socketmgr_t *manager, int fd, int msg) {
17 event.events = EPOLLIN;
18 else
19 event.events = EPOLLOUT;
20+ memset(&event.data, 0, sizeof(event.data));
21 event.data.fd = fd;
22 if (epoll_ctl(manager->epoll_fd, EPOLL_CTL_ADD, fd, &event) == -1 &&
23 errno != EEXIST) {
24@@ -719,6 +720,7 @@ unwatch_fd(isc_socketmgr_t *manager, int fd, int msg) {
25 event.events = EPOLLIN;
26 else
27 event.events = EPOLLOUT;
28+ memset(&event.data, 0, sizeof(event.data));
29 event.data.fd = fd;
30 if (epoll_ctl(manager->epoll_fd, EPOLL_CTL_DEL, fd, &event) == -1 &&
31 errno != ENOENT) {
32--
331.6.3.3
34
Note: See TracBrowser for help on using the repository browser.