xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit d35f68336b0a462dc660797d1779581f348af04e
Author: Sjoerd Simons <sjoerd at collabora.com>
Date:   Fri Apr 10 16:34:06 2020 +0200

    xwayland: Fix crashes when there is no pointer
    
    When running with a weston session without a pointer device (thus with
    the wl_seat not having a pointer) xwayland pointer warping and pointer
    confining should simply be ignored to avoid crashes.
    
    Signed-off-by: Sjoerd Simons <sjoerd at collabora.com>

diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 5ab1a5fa8..f7ba91051 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -2806,6 +2806,9 @@ xwl_seat_can_emulate_pointer_warp(struct xwl_seat *xwl_seat)
 {
     struct xwl_screen *xwl_screen = xwl_seat->xwl_screen;
 
+    if (!xwl_seat->pointer)
+        return FALSE;
+
     if (!xwl_screen->relative_pointer_manager)
         return FALSE;
 
@@ -2900,6 +2903,9 @@ xwl_seat_confine_pointer(struct xwl_seat *xwl_seat,
     if (!pointer_constraints)
         return;
 
+    if (!xwl_seat->wl_pointer)
+        return;
+
     if (xwl_seat->cursor_confinement_window == xwl_window &&
         xwl_seat->confined_pointer)
         return;