luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-28 10:07:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a locking problem in g_main_context_iterate()

Browse Source 
We failed to ensure that the context is locked on every exit of
the function. This fixes bug 583324.
This commit is contained in:
Matthias Clasen
2009-05-27 12:01:14 -04:00
parent 209a662c2f
commit 00151ec0e1
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glib/gmain.c
View File

@@ -2390,13 +2390,13 @@ g_main_context_iterate (GMainContext *context,
{ {
gboolean got_ownership; gboolean got_ownership;
LOCK_CONTEXT (context);
g_return_val_if_fail (g_thread_supported (), FALSE); g_return_val_if_fail (g_thread_supported (), FALSE);
if (!block) if (!block)
return FALSE; return FALSE;
LOCK_CONTEXT (context);
if (!context->cond) if (!context->cond)
context->cond = g_cond_new (); context->cond = g_cond_new ();
@@ -2405,11 +2405,8 @@ g_main_context_iterate (GMainContext *context,
g_static_mutex_get_mutex (&context->mutex)); g_static_mutex_get_mutex (&context->mutex));
if (!got_ownership) if (!got_ownership)
{
UNLOCK_CONTEXT (context);
return FALSE; return FALSE;
} }
}
else else
LOCK_CONTEXT (context); LOCK_CONTEXT (context);
#endif /* G_THREADS_ENABLED */ #endif /* G_THREADS_ENABLED */