fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-02-04 15:30:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: spa-device: fix POD props iteration + key lifetimes

Browse source 
Fix memory leaks in bad GValue handling.  Unset iterator GValue after
use and strdup keys.  The keys aren't necessarily static strings (for
id-XXXX properties), so have to be dup'd.
This commit is contained in:
Pauli Virtanen 2024-12-20 19:15:21 +02:00
parent 027aba7f3b
commit 83e93876d5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/wp/device.c
View file

@ -357,7 +357,7 @@ append_props (WpSpaPodBuilder *b, WpSpaPod *props, GHashTable *used)
g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (props);
GValue next = G_VALUE_INIT;
while (wp_iterator_next (it, &next)) {
for (; wp_iterator_next (it, &next); g_value_unset (&next)) {
WpSpaPod *p = g_value_get_boxed (&next);
const char *key;
g_autoptr (WpSpaPod) value = NULL;
@ -370,14 +370,14 @@ append_props (WpSpaPodBuilder *b, WpSpaPod *props, GHashTable *used)
wp_spa_pod_builder_add_property (b, key);
wp_spa_pod_builder_add_pod (b, value);
g_hash_table_add (used, (gpointer) key);
g_hash_table_add (used, (gpointer) g_strdup (key));
}
}
static WpSpaPod *
merge_props (WpSpaPod *old_props, WpSpaPod *new_props)
{
g_autoptr (GHashTable) used = g_hash_table_new (g_str_hash, g_str_equal);
g_autoptr (GHashTable) used = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
g_autoptr (WpSpaPodBuilder) b = wp_spa_pod_builder_new_object (
"Spa:Pod:Object:Param:Props", "Props");