cceebb32c7
See https://gitlab.gnome.org/GNOME/glib/-/issues/3054 and https://bodhi.fedoraproject.org/updates/FEDORA-2023-b0f2753db9 for details.
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From c7519c709f67f1a77bcbcfdaac96bd0a5c46538f Mon Sep 17 00:00:00 2001
|
|
From: Adam Williamson <awilliam@redhat.com>
|
|
Date: Mon, 17 Jul 2023 17:43:47 -0700
|
|
Subject: [PATCH] Revert "gmain: Add precondition assertions to
|
|
g_main_context_release()"
|
|
|
|
This reverts commit 3926af723a7469a2ea492307f421820361d617b3.
|
|
It causes anaconda (the Fedora installer) to crash early, see
|
|
https://gitlab.gnome.org/GNOME/glib/-/issues/3054 .
|
|
---
|
|
glib/gmain.c | 16 +---------------
|
|
1 file changed, 1 insertion(+), 15 deletions(-)
|
|
|
|
diff --git a/glib/gmain.c b/glib/gmain.c
|
|
index fac14224a..73084134d 100644
|
|
--- a/glib/gmain.c
|
|
+++ b/glib/gmain.c
|
|
@@ -3594,23 +3594,9 @@ g_main_context_release (GMainContext *context)
|
|
{
|
|
if (context == NULL)
|
|
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);
|
|
- }
|
|
-#endif /* !G_DISABLE_CHECKS */
|
|
-
|
|
g_main_context_release_unlocked (context);
|
|
|
|
UNLOCK_CONTEXT (context);
|
|
--
|
|
2.41.0
|
|
|