brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cally/stage: Don't add weak pointer to stage

Browse Source 
The CallyStage objects lifetime is tied to the stage, so if we add a
weak pointer to it, we won't be able to remove it, as we would try to do
so not until the stage itself is being disposed, at which point removing
it fails. However, not removing it will make the stage try to clean up
the weak refs, and since it does this more or less directly after
freeing the cally stage, it ends up writing NULL to freed memory,
causing memory corruption.

Fix this by avoiding adding the weak pointer when that pointer is to the
stage.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1775>
This commit is contained in:
Jonas Ådahl 2021-03-12 15:36:08 +01:00 committed by Marge Bot
parent 12f2fcd332
commit 1ff1100d76
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter/cally/cally-stage.c
View File

@ -134,8 +134,11 @@ cally_stage_notify_key_focus_cb (ClutterStage *stage,
if (self->priv->key_focus != NULL) if (self->priv->key_focus != NULL)
{ {
g_object_remove_weak_pointer (G_OBJECT (self->priv->key_focus), if (self->priv->key_focus != CLUTTER_ACTOR (stage))
(gpointer *) &self->priv->key_focus); {
g_object_remove_weak_pointer (G_OBJECT (self->priv->key_focus),
(gpointer *) &self->priv->key_focus);
}
old = clutter_actor_get_accessible (self->priv->key_focus); old = clutter_actor_get_accessible (self->priv->key_focus);
} }
else else
@ -160,8 +163,11 @@ cally_stage_notify_key_focus_cb (ClutterStage *stage,
* *
* we remove the weak pointer above. * we remove the weak pointer above.
*/ */
g_object_add_weak_pointer (G_OBJECT (self->priv->key_focus), if (key_focus != CLUTTER_ACTOR (stage))
(gpointer *) &self->priv->key_focus); {
g_object_add_weak_pointer (G_OBJECT (self->priv->key_focus),
(gpointer *) &self->priv->key_focus);
}
new = clutter_actor_get_accessible (key_focus); new = clutter_actor_get_accessible (key_focus);
} }