brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/scroll-view: Use clutter_actor_get_effect() to get fade effect

Browse Source 
Storing the pointer to the fade effect only works as long as we control
all the code that can modify the effects of an actor, but this is not
the case in the presence of extensions. Apparently some extension
manages to remove the effect, which leads to fade_effect pointing to
some invalid address by the time dispose is called, leading to a crash.

This instead uses clutter_actor_get_effect() to get the effect when it
is needed to avoid crashing in these situations.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6521
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2974>
This commit is contained in:
Sebastian Keller 2023-10-02 14:36:33 +02:00 committed by Marge Bot
parent eaa20d951d
commit fae5bdaa00
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/st/st-scroll-view.c
View File

@ -90,8 +90,6 @@ struct _StScrollViewPrivate
gfloat row_size;
gfloat column_size;
StScrollViewFade *fade_effect;
guint row_size_set : 1;
guint column_size_set : 1;
guint mouse_scroll : 1;
@ -173,32 +171,35 @@ void
st_scroll_view_update_fade_effect (StScrollView *scroll,
ClutterMargin *fade_margins)
{
StScrollViewPrivate *priv = ST_SCROLL_VIEW (scroll)->priv;
ClutterEffect *fade_effect =
clutter_actor_get_effect (CLUTTER_ACTOR (scroll), "fade");
if (fade_effect && !ST_IS_SCROLL_VIEW_FADE (fade_effect))
{
clutter_actor_remove_effect (CLUTTER_ACTOR (scroll), fade_effect);
fade_effect = NULL;
}
/* A fade amount of other than 0 enables the effect. */
if (fade_margins->left != 0. || fade_margins->right != 0. ||
fade_margins->top != 0. || fade_margins->bottom != 0.)
{
if (priv->fade_effect == NULL)
if (fade_effect == NULL)
{
priv->fade_effect = g_object_new (ST_TYPE_SCROLL_VIEW_FADE, NULL);
fade_effect = g_object_new (ST_TYPE_SCROLL_VIEW_FADE, NULL);
clutter_actor_add_effect_with_name (CLUTTER_ACTOR (scroll), "fade",
CLUTTER_EFFECT (priv->fade_effect));
fade_effect);
}
g_object_set (priv->fade_effect,
g_object_set (ST_SCROLL_VIEW_FADE (fade_effect),
"fade-margins", fade_margins,
NULL);
}
else
{
if (priv->fade_effect != NULL)
{
clutter_actor_remove_effect (CLUTTER_ACTOR (scroll),
CLUTTER_EFFECT (priv->fade_effect));
priv->fade_effect = NULL;
}
if (fade_effect != NULL)
clutter_actor_remove_effect (CLUTTER_ACTOR (scroll), fade_effect);
}
}
@ -241,11 +242,10 @@ st_scroll_view_dispose (GObject *object)
{
StScrollViewPrivate *priv = ST_SCROLL_VIEW (object)->priv;
if (priv->fade_effect)
{
clutter_actor_remove_effect (CLUTTER_ACTOR (object), CLUTTER_EFFECT (priv->fade_effect));
priv->fade_effect = NULL;
}
/* The fade effect disconnects from the adjustments and
* needs to be removed while those are still alive.
*/
clutter_actor_clear_effects (CLUTTER_ACTOR (object));
g_clear_pointer (&priv->vscroll, clutter_actor_destroy);
g_clear_pointer (&priv->hscroll, clutter_actor_destroy);