From: Kay Sievers <kay@vrfy.org>
Date: Sat, 6 Apr 2013 00:56:04 +0000 (+0200)
Subject: dbus-loop.c: fix variable initialization
X-Git-Tag: v201~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2f9f5aa014bda3b52ae388a7283e0fd50d4621c3

dbus-loop.c: fix variable initialization

Fix for:
  b92bea5d2a9481de69bb627a7b442a9f58fca43d
Causing:
  systemd-logind[265]: Assertion 'd = event.data.ptr' failed at src/shared/dbus-loop.c:233, function bus_loop_dispatch(). Aborting.
---

diff --git a/src/shared/dbus-loop.c b/src/shared/dbus-loop.c
index b42ae1451..fadbd4395 100644
--- a/src/shared/dbus-loop.c
+++ b/src/shared/dbus-loop.c
@@ -45,7 +45,7 @@ typedef struct EpollData {
 
 static dbus_bool_t add_watch(DBusWatch *watch, void *data) {
         EpollData _cleanup_free_ *e = NULL;
-        struct epoll_event ev = { .data.ptr = e };
+        struct epoll_event ev = {};
 
         assert(watch);
 
@@ -58,6 +58,7 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) {
         e->is_timeout = false;
 
         ev.events = bus_flags_to_events(watch);
+        ev.data.ptr = e;
 
         if (epoll_ctl(PTR_TO_INT(data), EPOLL_CTL_ADD, e->fd, &ev) < 0) {