[PATCH xserver] os: Initialize NotifyFds earlier in startup

[Peter Hutterer]

On Tue, May 31, 2016 at 09:40:13AM -0700, Keith Packard wrote:
> 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 at keithp.com>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter
> ---
>  os/osinit.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/os/osinit.c b/os/osinit.c
> index 54b39a0..629fef5 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();
> -- 
> 2.8.1
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>