rpms/glib2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport PR #2784 to fix weak_locations != NULL crashes

Browse Source
This commit is contained in:
Adam Williamson 2022-06-28 16:54:11 -07:00
parent d160263355
commit 5cfc8d9d4f
2 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
2784.patch Normal file
View File

@ -0,0 +1,63 @@
From d4043eced5c7f21b1a4942b305f9ded127cbdb83 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 26 Jun 2022 12:04:32 +0100
Subject: [PATCH] Revert "gobject: Use g_datalist_id_remove_multiple"
This reverts commit fa8c7c0 "gobject: Use g_datalist_id_remove_multiple"
(or more specifically the parts of it that were not already reverted
in 01ac1d9 "gobject: Fix crash when disposing a GtkAccelGroup".
Workaround for https://gitlab.gnome.org/GNOME/glib/-/issues/2676
Bug: https://gitlab.gnome.org/GNOME/glib/-/issues/2676
---
gobject/gobject.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 5ba8fd017b..1c6bfedfae 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -1353,17 +1353,10 @@ g_object_do_get_property (GObject *object,
static void
g_object_real_dispose (GObject *object)
{
- GQuark keys[3] = {
- quark_closure_array,
- quark_weak_refs,
- quark_weak_locations,
- };
-
g_signal_handlers_destroy (object);
- /* FIXME: This should be simplified down to a single remove_multiple() call.
- * See https://gitlab.gnome.org/GNOME/glib/-/issues/2672 */
- g_datalist_id_remove_multiple (&object->qdata, keys, 1);
- g_datalist_id_remove_multiple (&object->qdata, keys + 1, 2);
+ g_datalist_id_set_data (&object->qdata, quark_closure_array, NULL);
+ g_datalist_id_set_data (&object->qdata, quark_weak_refs, NULL);
+ g_datalist_id_set_data (&object->qdata, quark_weak_locations, NULL);
}
#ifdef G_ENABLE_DEBUG
@@ -3888,15 +3881,10 @@ g_object_unref (gpointer _object)
}
/* we are still in the process of taking away the last ref */
+ g_datalist_id_set_data (&object->qdata, quark_closure_array, NULL);
g_signal_handlers_destroy (object);
- {
- GQuark keys[3] = {
- quark_closure_array,
- quark_weak_refs,
- quark_weak_locations,
- };
- g_datalist_id_remove_multiple (&object->qdata, keys, G_N_ELEMENTS (keys));
- }
+ g_datalist_id_set_data (&object->qdata, quark_weak_refs, NULL);
+ g_datalist_id_set_data (&object->qdata, quark_weak_locations, NULL);
/* decrement the last reference */
old_ref = g_atomic_int_add (&object->ref_count, -1);
--
GitLab

5
glib2.spec
View File

@ -17,6 +17,11 @@ Patch0: gnutls-hmac.patch
# Proposed upstream at https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1596 # Proposed upstream at https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1596
Patch1: gdesktopappinfo.patch Patch1: gdesktopappinfo.patch
# Revert parts of a commit to avoid "weak_locations != NULL" crashes:
# https://gitlab.gnome.org/GNOME/glib/-/issues/2676
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2784
Patch2: 2784.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gettext BuildRequires: gettext