mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-30 21:37:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: avoid unitialized spa_dict::flags

Browse source 
In multiple cases the `flags` member of `spa_dict` is left unitialized,
so try to avoid that. For example in `fill_node_info_proplist()` it is
accessed in `spa_dict_lookup_item()`.

This also modifies `collect_props()` to not depend on a partially initialized
`dict` parameter.
This commit is contained in:
Barnabás Pőcze 2026-05-10 16:44:17 +02:00
parent bcdc5356f2
commit a4323c6814
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-protocol-pulse/collect.c
View file

@ -508,7 +508,8 @@ uint32_t find_port_index(struct pw_manager_object *card, uint32_t direction, con
return SPA_ID_INVALID;
}
struct spa_dict *collect_props(struct spa_pod *info, struct spa_dict *dict)
struct spa_dict *collect_props(struct spa_pod *info, struct spa_dict *dict,
struct spa_dict_item *items, size_t capacity)
{
struct spa_pod_parser prs;
struct spa_pod_frame f[1];
@ -519,15 +520,18 @@ struct spa_dict *collect_props(struct spa_pod *info, struct spa_dict *dict)
spa_pod_parser_get_int(&prs, &n_items) < 0)
return NULL;
if (n_items < 0 || (size_t) n_items > capacity)
return NULL;
for (n = 0; n < n_items; n++) {
if (spa_pod_parser_get(&prs,
SPA_POD_String(&dict->items[n].key),
SPA_POD_String(&dict->items[n].value),
SPA_POD_String(&items[n].key),
SPA_POD_String(&items[n].value),
NULL) < 0)
break;
}
spa_pod_parser_pop(&prs, &f[0]);
dict->n_items = n;
*dict = SPA_DICT_INIT(items, n);
return dict;
}