mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

xwayland.c handle_map(): NULL out xsurface->data() to prevent crashing.

Browse Source 
When changing a surface from managed to unmanaged in handle_map(), the
call to handle_destroy(.., view) causes the sway_xwayland_view pointed
to by the untyped wlr_xwayland_surface.data field to become invalid
garbage, yet the untyped wlr_xwayland_surface.data continues to point
at it.  In particular: view_get_*(view_from_wlr_surface(..)), even
with appropriate NULL checking, will crash sway when this codepath is
exercised (reliable test case: drop-down menus in Google Earth).
This commit is contained in:
A. M. Joseph 2019-10-16 23:55:40 -07:00 committed by Simon Ser
parent d19f4f7bf8
commit 74c0e7921a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sway/desktop/xwayland.c
View File

@ -401,6 +401,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
// This window used not to have the override redirect flag and has it // This window used not to have the override redirect flag and has it
// now. Switch to unmanaged. // now. Switch to unmanaged.
handle_destroy(&xwayland_view->destroy, view); handle_destroy(&xwayland_view->destroy, view);
xsurface->data = NULL;
struct sway_xwayland_unmanaged *unmanaged = create_unmanaged(xsurface); struct sway_xwayland_unmanaged *unmanaged = create_unmanaged(xsurface);
unmanaged_handle_map(&unmanaged->map, xsurface); unmanaged_handle_map(&unmanaged->map, xsurface);
return; return;