mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-10 13:30:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix memory leak in pw_properties_set

Browse source 
removing a property leaked the key
This commit is contained in:
Jesse Pullinen 2018-08-30 19:40:40 +03:00 • committed by Wim Taymans
parent 021d6cf25a
commit 692d96b9a4
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pipewire/properties.c
View file

@ -247,13 +247,13 @@ void pw_properties_free(struct pw_properties *properties)
free(impl); free(impl);
} }
static int do_replace(struct pw_properties *properties, char *key, char *value) static int do_replace(struct pw_properties *properties, const char *key, char *value)
{ {
struct properties *impl = SPA_CONTAINER_OF(properties, struct properties, this); struct properties *impl = SPA_CONTAINER_OF(properties, struct properties, this);
int index = find_index(properties, key); int index = find_index(properties, key);
if (index == -1) { if (index == -1) {
add_func(properties, key, value); add_func(properties, strdup(key), value);
} else { } else {
struct spa_dict_item *item = struct spa_dict_item *item =
pw_array_get_unchecked(&impl->items, index, struct spa_dict_item); pw_array_get_unchecked(&impl->items, index, struct spa_dict_item);
@ -267,7 +267,7 @@ static int do_replace(struct pw_properties *properties, char *key, char *value)
item->value = other->value; item->value = other->value;
impl->items.size -= sizeof(struct spa_dict_item); impl->items.size -= sizeof(struct spa_dict_item);
} else { } else {
item->key = key; item->key = strdup(key);
item->value = value; item->value = value;
} }
} }
@ -288,7 +288,7 @@ static int do_replace(struct pw_properties *properties, char *key, char *value)
*/ */
int pw_properties_set(struct pw_properties *properties, const char *key, const char *value) int pw_properties_set(struct pw_properties *properties, const char *key, const char *value)
{ {
return do_replace(properties, strdup(key), value ? strdup(value) : NULL); return do_replace(properties, key, value ? strdup(value) : NULL);
} }
/** Set a property value by format /** Set a property value by format
@ -312,7 +312,7 @@ int pw_properties_setf(struct pw_properties *properties, const char *key, const
vasprintf(&value, format, varargs); vasprintf(&value, format, varargs);
va_end(varargs); va_end(varargs);
return do_replace(properties, strdup(key), value); return do_replace(properties, key, value);
} }
/** Get a property /** Get a property