From ce6546337487c052b5dd3c04d3d8d4b09d691c3d Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 31 May 2016 09:38:17 -0700
Subject: os: Initialize NotifyFds earlier in startup

If the server calls AbortServer during the first-time initialization
(which can happen if you start the server on an already using
DISPLAY), then the dbus code will shut down and call the notify fd
interface. If the notify fd list hasn't been initialized, the server
will crash.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 os/osinit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/os/osinit.c b/os/osinit.c
index 54b39a0e8..629fef569 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -195,6 +195,7 @@ OsInit(void)
 #ifdef BUSFAULT
         busfault_init();
 #endif
+        InitNotifyFds();
 
 #ifdef HAVE_BACKTRACE
         /*
@@ -314,7 +315,6 @@ OsInit(void)
         LockServer();
         been_here = TRUE;
     }
-    InitNotifyFds();
     TimerInit();
     OsVendorInit();
     OsResetSignals();
-- 
cgit v1.2.3