xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-input.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit e33453f9111b21e4814d628e6ae00bc7b200f404
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Jul 10 18:56:42 2020 +0200

    xwayland: Handle NULL xwl_seat in xwl_seat_can_emulate_pointer_warp
    
    This can happen e.g. with weston's headless backend.
    
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 946315cd2..12efbe169 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -2807,11 +2807,16 @@ xwl_seat_create_pointer_warp_emulator(struct xwl_seat *xwl_seat)
 static Bool
 xwl_seat_can_emulate_pointer_warp(struct xwl_seat *xwl_seat)
 {
-    struct xwl_screen *xwl_screen = xwl_seat->xwl_screen;
+    struct xwl_screen *xwl_screen;
+
+    if (!xwl_seat)
+        return FALSE;
 
     if (!xwl_seat->pointer)
         return FALSE;
 
+    xwl_screen = xwl_seat->xwl_screen;
+
     if (!xwl_screen->relative_pointer_manager)
         return FALSE;