mirror of
https://github.com/openwrt/packages.git
synced 2025-12-23 18:54:30 +04:00
3932357ffb
Bump glib2 to 2.74.7 which fixes CVE-2023-29499, CVE-2023-32611, CVE-2023-32636, CVE-2023-32643, CVE-2023-32665 and on top of that backport CVE-2024-34397 fix from Debian Bookworm glib2 package 2.74.6-2+deb12u2. While at it refresh the patches so they apply cleanly. References: https://security-tracker.debian.org/tracker/source-package/glib2.0 Fixes: CVE-2023-29499, CVE-2023-32611, CVE-2023-32636, CVE-2023-32643, CVE-2023-32665, CVE-2024-34397 Signed-off-by: Petr Štetiar <ynezz@true.cz>
100 lines
3.7 KiB
Diff
100 lines
3.7 KiB
Diff
From: Simon McVittie <smcv@collabora.com>
|
|
Date: Tue, 23 Apr 2024 20:31:57 +0100
|
|
Subject: gdbusconnection: Factor out add_signal_data()
|
|
|
|
No functional changes.
|
|
|
|
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
|
Origin: upstream, https://gitlab.gnome.org/GNOME/glib/-/issues/3268
|
|
---
|
|
gio/gdbusconnection.c | 64 +++++++++++++++++++++++++++++----------------------
|
|
1 file changed, 37 insertions(+), 27 deletions(-)
|
|
|
|
--- a/gio/gdbusconnection.c
|
|
+++ b/gio/gdbusconnection.c
|
|
@@ -3450,6 +3450,42 @@ is_signal_data_for_name_lost_or_acquired
|
|
|
|
/* ---------------------------------------------------------------------------------------------------- */
|
|
|
|
+/* called in any thread, connection lock is held */
|
|
+static void
|
|
+add_signal_data (GDBusConnection *connection,
|
|
+ SignalData *signal_data)
|
|
+{
|
|
+ GPtrArray *signal_data_array;
|
|
+
|
|
+ g_hash_table_insert (connection->map_rule_to_signal_data,
|
|
+ signal_data->rule,
|
|
+ signal_data);
|
|
+
|
|
+ /* Add the match rule to the bus...
|
|
+ *
|
|
+ * Avoid adding match rules for NameLost and NameAcquired messages - the bus will
|
|
+ * always send such messages to us.
|
|
+ */
|
|
+ if (connection->flags & G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION)
|
|
+ {
|
|
+ if (!is_signal_data_for_name_lost_or_acquired (signal_data))
|
|
+ add_match_rule (connection, signal_data->rule);
|
|
+ }
|
|
+
|
|
+ signal_data_array = g_hash_table_lookup (connection->map_sender_unique_name_to_signal_data_array,
|
|
+ signal_data->sender_unique_name);
|
|
+ if (signal_data_array == NULL)
|
|
+ {
|
|
+ signal_data_array = g_ptr_array_new ();
|
|
+ g_hash_table_insert (connection->map_sender_unique_name_to_signal_data_array,
|
|
+ g_strdup (signal_data->sender_unique_name),
|
|
+ signal_data_array);
|
|
+ }
|
|
+ g_ptr_array_add (signal_data_array, signal_data);
|
|
+}
|
|
+
|
|
+/* ---------------------------------------------------------------------------------------------------- */
|
|
+
|
|
/**
|
|
* g_dbus_connection_signal_subscribe:
|
|
* @connection: a #GDBusConnection
|
|
@@ -3539,7 +3575,6 @@ g_dbus_connection_signal_subscribe (GDBu
|
|
gchar *rule;
|
|
SignalData *signal_data;
|
|
SignalSubscriber *subscriber;
|
|
- GPtrArray *signal_data_array;
|
|
const gchar *sender_unique_name;
|
|
|
|
/* Right now we abort if AddMatch() fails since it can only fail with the bus being in
|
|
@@ -3605,32 +3640,7 @@ g_dbus_connection_signal_subscribe (GDBu
|
|
g_strdup (arg0),
|
|
flags);
|
|
g_ptr_array_add (signal_data->subscribers, subscriber);
|
|
-
|
|
- g_hash_table_insert (connection->map_rule_to_signal_data,
|
|
- signal_data->rule,
|
|
- signal_data);
|
|
-
|
|
- /* Add the match rule to the bus...
|
|
- *
|
|
- * Avoid adding match rules for NameLost and NameAcquired messages - the bus will
|
|
- * always send such messages to us.
|
|
- */
|
|
- if (connection->flags & G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION)
|
|
- {
|
|
- if (!is_signal_data_for_name_lost_or_acquired (signal_data))
|
|
- add_match_rule (connection, signal_data->rule);
|
|
- }
|
|
-
|
|
- signal_data_array = g_hash_table_lookup (connection->map_sender_unique_name_to_signal_data_array,
|
|
- signal_data->sender_unique_name);
|
|
- if (signal_data_array == NULL)
|
|
- {
|
|
- signal_data_array = g_ptr_array_new ();
|
|
- g_hash_table_insert (connection->map_sender_unique_name_to_signal_data_array,
|
|
- g_strdup (signal_data->sender_unique_name),
|
|
- signal_data_array);
|
|
- }
|
|
- g_ptr_array_add (signal_data_array, signal_data);
|
|
+ add_signal_data (connection, signal_data);
|
|
|
|
out:
|
|
g_hash_table_insert (connection->map_id_to_signal_data,
|