luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'th/fix-main-context-release-owner-check' into 'main'

Browse Source 
gmain: drop owner check assertion in g_main_context_release()

Closes #3054

See merge request GNOME/glib!3513
This commit is contained in:
Philip Withnall 2023-07-30 10:09:09 +00:00
commit 1f59981f7f
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
glib/gmain.c
View File

@ -3596,30 +3596,27 @@ g_main_context_release (GMainContext *context)
context = g_main_context_default ();
LOCK_CONTEXT (context);
#ifndef G_DISABLE_CHECKS
if (G_UNLIKELY (context->owner != G_THREAD_SELF || context->owner_count == 0))
{
GThread *context_owner = context->owner;
guint context_owner_count = context->owner_count;
UNLOCK_CONTEXT (context);
g_critical ("g_main_context_release() called on a context (%p, owner %p, "
"owner count %u) which is not acquired by the current thread",
context, context_owner, context_owner_count);
return;
}
#endif /* !G_DISABLE_CHECKS */
g_main_context_release_unlocked (context);
UNLOCK_CONTEXT (context);
}
static void
g_main_context_release_unlocked (GMainContext *context)
{
/* NOTE: We should also have the following assert here:
* g_return_if_fail (context->owner == G_THREAD_SELF);
* However, this breaks NetworkManager, which has been (non-compliantly but
* apparently safely) releasing a #GMainContext from a thread which didn’t
* acquire it.
* Breaking that would be quite disruptive, so we won’t do that now. However,
* GLib reserves the right to add that assertion in future, if doing so would
* allow for optimisations or refactorings. By that point, NetworkManager will
* have to have reworked its use of #GMainContext.
*
* See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3513
*/
g_return_if_fail (context->owner_count > 0);
context->owner_count--;
if (context->owner_count == 0)
{