xserver: Branch 'master'

[Keith Packard]

 config/dbus-core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3caf671ed2a8a79856409a109355fc0f393d7aed
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Sep 14 22:40:32 2016 -0700

    config/dbus: Initialize dbus fd to -1 so teardown doesn't use fd 0
    
    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>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

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);