isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-28 14:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: Don't crash when the window disappears from under us

Browse Source 
If we attach to a MetaWindow that disappears before the idle fires,
we'll notice that we can't associate the window properly again and
try to access data on the MetaWindow struct, which might crash.

Install a weak ref that ties the lifetime of the idle to the lifetime
of the MetaWindow.

It seems every GTK+ app does this for some reason at startup. This
is really unfortunate, since we'll have to create and destroy a new
MetaWindow really quickly.
This commit is contained in:
Jasper St. Pierre 2014-05-04 15:48:41 -04:00
parent afaab8aef2
commit 9c4908b44a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wayland/meta-xwayland.c
View File

@ -76,8 +76,18 @@ typedef struct {
MetaXWaylandManager *manager; MetaXWaylandManager *manager;
MetaWindow *window; MetaWindow *window;
guint32 surface_id; guint32 surface_id;
guint idle_id;
} AssociateWindowWithSurfaceOp; } AssociateWindowWithSurfaceOp;
static void
associate_window_with_surface_window_destroyed (gpointer user_data,
GObject *obj)
{
AssociateWindowWithSurfaceOp *op = user_data;
g_source_remove (op->idle_id);
g_free (op);
}
static gboolean static gboolean
associate_window_with_surface_idle (gpointer user_data) associate_window_with_surface_idle (gpointer user_data)
{ {
@ -87,6 +97,7 @@ associate_window_with_surface_idle (gpointer user_data)
/* Not here? Oh well... nothing we can do */ /* Not here? Oh well... nothing we can do */
g_warning ("Unknown surface ID %d (from window %s)", op->surface_id, op->window->desc); g_warning ("Unknown surface ID %d (from window %s)", op->surface_id, op->window->desc);
} }
g_object_weak_unref (G_OBJECT (op->window), associate_window_with_surface_window_destroyed, op);
g_free (op); g_free (op);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
@ -101,8 +112,6 @@ meta_xwayland_handle_wl_surface_id (MetaWindow *window,
if (!associate_window_with_surface_id (manager, window, surface_id)) if (!associate_window_with_surface_id (manager, window, surface_id))
{ {
guint id;
/* No surface ID yet... it should arrive after the next /* No surface ID yet... it should arrive after the next
* iteration through the loop, so queue an idle and see * iteration through the loop, so queue an idle and see
* what happens. * what happens.
@ -111,8 +120,10 @@ meta_xwayland_handle_wl_surface_id (MetaWindow *window,
op->manager = manager; op->manager = manager;
op->window = window; op->window = window;
op->surface_id = surface_id; op->surface_id = surface_id;
id = g_idle_add (associate_window_with_surface_idle, op); op->idle_id = g_idle_add (associate_window_with_surface_idle, op);
g_source_set_name_by_id (id, "[mutter] associate_window_with_surface_idle"); g_source_set_name_by_id (op->idle_id, "[mutter] associate_window_with_surface_idle");
g_object_weak_ref (G_OBJECT (op->window), associate_window_with_surface_window_destroyed, op);
} }
} }