summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--shared/n-acd/src/n-acd.c2
-rw-r--r--shared/n-dhcp4/src/n-dhcp4-client.c2
-rw-r--r--src/systemd/src/libsystemd/sd-event/sd-event.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c
index c1d9286503..02383ea6bf 100644
--- a/shared/n-acd/src/n-acd.c
+++ b/shared/n-acd/src/n-acd.c
@@ -893,7 +893,7 @@ static int n_acd_dispatch_socket(NAcd *acd, struct epoll_event *event) {
* on failure.
*/
_c_public_ int n_acd_dispatch(NAcd *acd) {
- struct epoll_event events[2];
+ struct epoll_event events[2] = { };
int n, i, r = 0;
n = epoll_wait(acd->fd_epoll, events, sizeof(events) / sizeof(*events), 0);
diff --git a/shared/n-dhcp4/src/n-dhcp4-client.c b/shared/n-dhcp4/src/n-dhcp4-client.c
index 1dedbf30c8..29363fbfbe 100644
--- a/shared/n-dhcp4/src/n-dhcp4-client.c
+++ b/shared/n-dhcp4/src/n-dhcp4-client.c
@@ -755,7 +755,7 @@ static int n_dhcp4_client_dispatch_io(NDhcp4Client *client, struct epoll_event *
* there is more data to dispatch.
*/
_c_public_ int n_dhcp4_client_dispatch(NDhcp4Client *client) {
- struct epoll_event events[2];
+ struct epoll_event events[2] = { };
int n, i, r = 0;
n = epoll_wait(client->fd_epoll, events, sizeof(events) / sizeof(*events), 0);
diff --git a/src/systemd/src/libsystemd/sd-event/sd-event.c b/src/systemd/src/libsystemd/sd-event/sd-event.c
index 8b7691d0a6..280ea16c5b 100644
--- a/src/systemd/src/libsystemd/sd-event/sd-event.c
+++ b/src/systemd/src/libsystemd/sd-event/sd-event.c
@@ -3537,6 +3537,8 @@ _public_ int sd_event_wait(sd_event *e, uint64_t timeout) {
if (e->inotify_data_buffered)
timeout = 0;
+ memset (e->event_queue, 0, event_queue_max * sizeof (e->event_queue[0]));
+
m = epoll_wait(e->epoll_fd, e->event_queue, event_queue_max,
timeout == (uint64_t) -1 ? -1 : (int) DIV_ROUND_UP(timeout, USEC_PER_MSEC));
if (m < 0) {