xserver: Branch 'master'

[Keith Packard]

 hw/xwayland/xwayland.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f27d743c1899f307ec8063febbb3198c8945d372
Author: Carlos Olmedo Escobar <carlos.olmedo.e at gmail.com>
Date:   Wed Jan 21 01:44:54 2015 +0100

    Avoid possible null pointer dereference.
    
    Signed-off-by: Carlos Olmedo Escobar <carlos.olmedo.e at gmail.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 37d6d82..7e8d667 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -513,9 +513,9 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
     int ret, bpc, green_bpc, i;
 
     xwl_screen = calloc(sizeof *xwl_screen, 1);
-    xwl_screen->wm_fd = -1;
     if (xwl_screen == NULL)
         return FALSE;
+    xwl_screen->wm_fd = -1;
 
     if (!dixRegisterPrivateKey(&xwl_screen_private_key, PRIVATE_SCREEN, 0))
         return FALSE;