From 0be812161e17b28c6da430b34f850e6323705683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Sun, 7 Oct 2018 15:55:07 +0000
Subject: [PATCH 64/75] wayland/data-device: Focus out when focus surface
destroyed
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 95649fd2bccdac66c1d383b2db4707df12752276)
---
src/wayland/meta-wayland-data-device.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c
index 06356c1c2..da36c4e09 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -690,6 +690,7 @@ struct _MetaWaylandDragGrab {
struct wl_client *drag_client;
MetaWaylandSurface *drag_focus;
+ gulong drag_focus_destroy_handler_id;
struct wl_resource *drag_focus_data_device;
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);
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;
}
@@ -777,6 +789,8 @@ meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
if (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;
}
@@ -804,6 +818,10 @@ meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
offer = meta_wayland_data_source_send_offer (source, data_device_resource);
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;
meta_wayland_surface_drag_dest_focus_in (drag_grab->drag_focus,
--
2.21.0