mirror of
https://github.com/openwrt/packages.git
synced 2025-12-24 01:58:35 +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>
73 lines
2.9 KiB
Diff
73 lines
2.9 KiB
Diff
From: Simon McVittie <smcv@collabora.com>
|
|
Date: Thu, 14 Mar 2024 19:30:12 +0000
|
|
Subject: gdbusconnection: Factor out signal_data_new_take()
|
|
|
|
No functional changes, except that the implicit ownership-transfer
|
|
for the rule field becomes explicit (the local variable is set to NULL
|
|
afterwards).
|
|
|
|
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
|
Origin: upstream, https://gitlab.gnome.org/GNOME/glib/-/issues/3268
|
|
---
|
|
gio/gdbusconnection.c | 42 ++++++++++++++++++++++++++++++++----------
|
|
1 file changed, 32 insertions(+), 10 deletions(-)
|
|
|
|
--- a/gio/gdbusconnection.c
|
|
+++ b/gio/gdbusconnection.c
|
|
@@ -334,6 +334,30 @@ typedef struct
|
|
GPtrArray *subscribers; /* (owned) (element-type SignalSubscriber) */
|
|
} SignalData;
|
|
|
|
+static SignalData *
|
|
+signal_data_new_take (gchar *rule,
|
|
+ gchar *sender,
|
|
+ gchar *sender_unique_name,
|
|
+ gchar *interface_name,
|
|
+ gchar *member,
|
|
+ gchar *object_path,
|
|
+ gchar *arg0,
|
|
+ GDBusSignalFlags flags)
|
|
+{
|
|
+ SignalData *signal_data = g_new0 (SignalData, 1);
|
|
+
|
|
+ signal_data->rule = rule;
|
|
+ signal_data->sender = sender;
|
|
+ signal_data->sender_unique_name = sender_unique_name;
|
|
+ signal_data->interface_name = interface_name;
|
|
+ signal_data->member = member;
|
|
+ signal_data->object_path = object_path;
|
|
+ signal_data->arg0 = arg0;
|
|
+ signal_data->flags = flags;
|
|
+ signal_data->subscribers = g_ptr_array_new_with_free_func ((GDestroyNotify) signal_subscriber_unref);
|
|
+ return g_steal_pointer (&signal_data);
|
|
+}
|
|
+
|
|
static void
|
|
signal_data_free (SignalData *signal_data)
|
|
{
|
|
@@ -3572,16 +3596,14 @@ g_dbus_connection_signal_subscribe (GDBu
|
|
goto out;
|
|
}
|
|
|
|
- signal_data = g_new0 (SignalData, 1);
|
|
- signal_data->rule = rule;
|
|
- signal_data->sender = g_strdup (sender);
|
|
- signal_data->sender_unique_name = g_strdup (sender_unique_name);
|
|
- signal_data->interface_name = g_strdup (interface_name);
|
|
- signal_data->member = g_strdup (member);
|
|
- signal_data->object_path = g_strdup (object_path);
|
|
- signal_data->arg0 = g_strdup (arg0);
|
|
- signal_data->flags = flags;
|
|
- signal_data->subscribers = g_ptr_array_new_with_free_func ((GDestroyNotify) signal_subscriber_unref);
|
|
+ signal_data = signal_data_new_take (g_steal_pointer (&rule),
|
|
+ g_strdup (sender),
|
|
+ g_strdup (sender_unique_name),
|
|
+ g_strdup (interface_name),
|
|
+ g_strdup (member),
|
|
+ g_strdup (object_path),
|
|
+ g_strdup (arg0),
|
|
+ flags);
|
|
g_ptr_array_add (signal_data->subscribers, subscriber);
|
|
|
|
g_hash_table_insert (connection->map_rule_to_signal_data,
|