mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: do not set xsurface->data for unmanaged surface

Browse source 
xsurface->data is presumed to be a (struct view *) if set, so it must be
left NULL for an unmanaged surface. Otherwise view_from_wlr_surface()
may return a (struct xwayland_unmanaged *) where a (struct view *) was
expected, leading to a crash.

valgrind backtrace:

    Invalid read of size 1
      at 0x48F8FFC: wlr_scene_node_set_enabled (wlr_scene.c:903)
      by 0x124C9F: ssd_set_active (ssd.c:323)
      by 0x124C9F: ssd_set_active (ssd.c:318)
      by 0x124C9F: view_set_activated (view.c:215)
      by 0x118851: focus_change_notify (seat.c:353)
      by 0x487E01D: wl_signal_emit_mutable (wayland-server.c:2241)
      by 0x48FC8F2: wlr_seat_keyboard_enter (wlr_seat_keyboard.c:298)
      by 0x119E60: seat_focus.lto_priv.0 (seat.c:473)
      by 0x1248FD: seat_focus_surface (seat.c:491)
      by 0x1248FD: unmanaged_handle_map (xwayland-unmanaged.c:51)
      by 0x487E01D: wl_signal_emit_mutable (wayland-server.c:2241)
      by 0x487E01D: wl_signal_emit_mutable (wayland-server.c:2241)
      by 0x490FC91: surface_commit_state (wlr_compositor.c:499)
      by 0x56A24F5: ffi_call_unix64 (unix64.S:104)
      by 0x569EF5D: ffi_call_int.lto_priv.0 (ffi64.c:673)
    Address 0xa0e15ff30788b68 is not stack'd, malloc'd or (recently) free'd

Fixes: 4028a9482f
("seat: use focus_change event to update focused/active view")
This commit is contained in:
John Lindgren 2023-09-30 01:31:37 -04:00 • committed by Consolatis
parent 2e8820cf6a
commit 1c785d74c1
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/xwayland-unmanaged.c
View file

@ -144,7 +144,6 @@ unmanaged_handle_override_redirect(struct wl_listener *listener, void *data)
unmanaged_handle_unmap(&unmanaged->unmap, NULL);
}
unmanaged_handle_destroy(&unmanaged->destroy, NULL);
xsurface->data = NULL;
xwayland_view_create(server, xsurface, mapped);
}
@ -185,7 +184,12 @@ xwayland_unmanaged_create(struct server *server,
struct xwayland_unmanaged *unmanaged = znew(*unmanaged);
unmanaged->server = server;
unmanaged->xwayland_surface = xsurface;
xsurface->data = unmanaged;
/*
* xsurface->data is presumed to be a (struct view *) if set,
* so it must be left NULL for an unmanaged surface (it should
* be NULL already at this point).
*/
assert(!xsurface->data);
wl_signal_add(&xsurface->events.request_configure,
&unmanaged->request_configure);

3
src/xwayland.c
View file

@ -221,7 +221,8 @@ handle_destroy(struct wl_listener *listener, void *data)
/*
* Break view <-> xsurface association. Note that the xsurface
* may not actually be destroyed at this point; it may become an
* "unmanaged" surface instead.
* "unmanaged" surface instead (in that case it is important
* that xsurface->data not point to the destroyed view).
*/
xwayland_view->xwayland_surface->data = NULL;
xwayland_view->xwayland_surface = NULL;