Skip to content

[Backport to Xwayland 24.1] xwayland: Check for pointer in xwl_seat_leave_ptr()

Olivier Fourdan requested to merge ofourdan/xserver:xwayland-24.1-backports into xwayland-24.1

Since commit 792758fa ("xwayland: Update lost focus on deactivation"), in rootful mode, if we receive an "activated" state from xdg-shell indicating that the surface is no longer active, we shall end up calling xwl_seat_leave_ptr().

But xwl_seat_leave_ptr() does not actually check whether the seat has pointer capabilities, and if not, get_pointer_device() will return NULL.

As a result, we would crash using a NULL pointer in GetMaster(). This typically can happen when using Xwayland rootful on headless compositors such as "cage" which do not advertise any capabilities for the seat.

To avoid the issue, simply check whether get_pointer_device() returns a valid non-null device and bail out early otherwise.

Fixes: 792758fa - xwayland: Update lost focus on deactivation
Closes: #1700 (closed)
Signed-off-by: Olivier Fourdan ofourdan@redhat.com
Part-of: !1590 (merged)
(cherry picked from commit 72036261)

Merge request reports