diff options
| author | Ting-Wei Lan <lantw@src.gnome.org> | 2019-07-27 15:28:23 +0800 |
|---|---|---|
| committer | Philip Withnall <withnall@endlessm.com> | 2019-07-29 11:02:31 +0100 |
| commit | c5e3150443d4fe4b72b41b630da4ba0b7340ed3c (patch) | |
| tree | 11d0e5928960a2ddc0164331a3017dbb5da8907e | |
| parent | 0a63daa96426715498b55318f68a67baee40c509 (diff) | |
| download | glib-c5e3150443d4fe4b72b41b630da4ba0b7340ed3c.tar.gz | |
gapplication: remove inactivity_timeout source on finalize
The event source used to handle inactivity_timeout doesn't hold a
reference on the application. Therefore, it is possible for callback
function of the event source to run after the application has been
freed, leading to use-after-free problem. To avoid the problem, we
should remove the event source before the application is freed.
This should fix SIGBUS crash of gio/tests/gapplication on FreeBSD.
https://gitlab.gnome.org/GNOME/glib/issues/1846#note_566550
| -rw-r--r-- | gio/gapplication.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gio/gapplication.c b/gio/gapplication.c index 2d2ab48e3..321b34f54 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -1372,6 +1372,9 @@ g_application_finalize (GObject *object) { GApplication *application = G_APPLICATION (object); + if (application->priv->inactivity_timeout_id) + g_source_remove (application->priv->inactivity_timeout_id); + g_slist_free_full (application->priv->option_groups, (GDestroyNotify) g_option_group_unref); if (application->priv->main_options) g_option_group_unref (application->priv->main_options); |