From e33453f9111b21e4814d628e6ae00bc7b200f404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Fri, 10 Jul 2020 18:56:42 +0200 Subject: [PATCH] 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 --- hw/xwayland/xwayland-input.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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;