luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-25 02:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

gmain: handle child sources being destroyed before parent

Browse Source 
Fix a crash when a child source is destroyed before its parent. Also,
add a test case for this and the previous fix.
This commit is contained in:
Dan Winship
2012-07-18 15:08:44 -04:00
parent ee6e66cb44
commit 2357f67b1b
2 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
glib/gmain.c
View File

@@ -1091,7 +1091,7 @@ g_source_destroy_internal (GSource *source,
if (!SOURCE_DESTROYED (source))
{
GSList *tmp_list;
GSList *sources, *tmp_list;
gpointer old_cb_data;
GSourceCallbackFuncs *old_cb_funcs;
@@ -1122,20 +1122,24 @@ g_source_destroy_internal (GSource *source,
if (source->priv->child_sources)
{
/* This is safe because even if a child_source finalizer or
* closure notify tried to modify source->priv->child_sources
* from outside the lock, it would fail since
* SOURCE_DESTROYED(source) is now TRUE.
*/
tmp_list = source->priv->child_sources;
sources = tmp_list = source->priv->child_sources;
source->priv->child_sources = NULL;
while (tmp_list)
{
g_source_destroy_internal (tmp_list->data, context, TRUE);
g_source_unref_internal (tmp_list->data, context, TRUE);
tmp_list = tmp_list->next;
}
g_slist_free (source->priv->child_sources);
source->priv->child_sources = NULL;
g_slist_free (sources);
}
if (source->priv->parent_source)
{
GSource *parent = source->priv->parent_source;
parent->priv->child_sources =
g_slist_remove (parent->priv->child_sources, source);
source->priv->parent_source = NULL;
}
g_source_unref_internal (source, context, TRUE);
@@ -1364,7 +1368,6 @@ g_source_remove_child_source (GSource *source,
if (context)
LOCK_CONTEXT (context);
source->priv->child_sources = g_slist_remove (source->priv->child_sources, child_source);
g_source_destroy_internal (child_source, context, TRUE);
g_source_unref_internal (child_source, context, TRUE);