isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-27 18:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/data-device: Focus out when focus surface destroyed

Browse Source 
When repicking after a surface was destroyed, if the destroyed surface
was the drag focus, we'd try to focus-out from it after it was
destroyed, causing a NULL pointer dereference.

Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/336


(cherry picked from commit 95649fd2bc)
This commit is contained in:
Jonas Ådahl 2018-10-07 15:55:07 +00:00 committed by Marco Trevisan
parent b63bbda431
commit 0be812161e
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wayland/meta-wayland-data-device.c
View File

@ -690,6 +690,7 @@ struct _MetaWaylandDragGrab {
struct wl_client *drag_client; struct wl_client *drag_client;
MetaWaylandSurface *drag_focus; MetaWaylandSurface *drag_focus;
gulong drag_focus_destroy_handler_id;
struct wl_resource *drag_focus_data_device; struct wl_resource *drag_focus_data_device;
struct wl_listener drag_focus_listener; struct wl_listener drag_focus_listener;
@ -715,6 +716,17 @@ destroy_drag_focus (struct wl_listener *listener, void *data)
MetaWaylandDragGrab *grab = wl_container_of (listener, grab, drag_focus_listener); MetaWaylandDragGrab *grab = wl_container_of (listener, grab, drag_focus_listener);
grab->drag_focus_data_device = NULL; grab->drag_focus_data_device = NULL;
g_signal_handler_disconnect (grab->drag_focus,
grab->drag_focus_destroy_handler_id);
grab->drag_focus = NULL;
}
static void
on_drag_focus_destroyed (MetaWaylandSurface *surface,
MetaWaylandDragGrab *grab)
{
meta_wayland_surface_drag_dest_focus_out (grab->drag_focus);
grab->drag_focus = NULL; grab->drag_focus = NULL;
} }
@ -777,6 +789,8 @@ meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
if (drag_grab->drag_focus) if (drag_grab->drag_focus)
{ {
meta_wayland_surface_drag_dest_focus_out (drag_grab->drag_focus); meta_wayland_surface_drag_dest_focus_out (drag_grab->drag_focus);
g_signal_handler_disconnect (drag_grab->drag_focus,
drag_grab->drag_focus_destroy_handler_id);
drag_grab->drag_focus = NULL; drag_grab->drag_focus = NULL;
} }
@ -804,6 +818,10 @@ meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
offer = meta_wayland_data_source_send_offer (source, data_device_resource); offer = meta_wayland_data_source_send_offer (source, data_device_resource);
drag_grab->drag_focus = surface; drag_grab->drag_focus = surface;
drag_grab->drag_focus_destroy_handler_id =
g_signal_connect (surface, "destroy",
G_CALLBACK (on_drag_focus_destroyed),
drag_grab);
drag_grab->drag_focus_data_device = data_device_resource; drag_grab->drag_focus_data_device = data_device_resource;
meta_wayland_surface_drag_dest_focus_in (drag_grab->drag_focus, meta_wayland_surface_drag_dest_focus_in (drag_grab->drag_focus,