[PATCH xserver] config/dbus: Initialize dbus fd to -1 so teardown doesn't use fd 0

Keith Packard keithp at keithp.com
Thu Sep 15 05:44:15 UTC 2016


The dbus teardown code is called when the server fatal errors even if
that is before dbus has ever been initialized.  By statically
initializing the value of bus_info.fd, we avoid calling RemoveNotifyFd
on stdin.

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 config/dbus-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/dbus-core.c b/config/dbus-core.c
index 3c85ad7..6d9a3f9 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -43,7 +43,7 @@ struct dbus_core_info {
     OsTimerPtr timer;
     struct dbus_core_hook *hooks;
 };
-static struct dbus_core_info bus_info;
+static struct dbus_core_info bus_info = { .fd = -1 };
 
 static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg);
 
-- 
2.8.1



More information about the xorg-devel mailing list