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

pipewire: module-client-node: use pw_param_info_find() to check validity

Browse source 
Previously when parameters were enumarated, it was checked if at least one
param was known for `id`. If not, `-ENOENT` was returned to signal that
this param id is not supported.

This is not necessarily true, since a param id might be supported, but it
might have zero params at the moment, in which case an unexpected error
would be returned.

Fix that by using `pw_param_info_find()` with the underlying impl object
to check if the param id is actually supported.
This commit is contained in:
Barnabás Pőcze 2026-03-09 21:21:02 +01:00
parent 5e37d43881
commit abf37dbdde
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/module-client-node/client-node.c
View file

@ -330,11 +330,13 @@ static int impl_node_enum_params(void *object, int seq,
struct spa_pod_dynamic_builder b;
struct spa_result_node_params result;
uint32_t count = 0;
bool found = false;
spa_return_val_if_fail(impl != NULL, -EINVAL);
spa_return_val_if_fail(num != 0, -EINVAL);
if (!pw_param_info_find(impl->this.node->info.params, impl->this.node->info.n_params, id))
return -ENOENT;
result.id = id;
result.next = 0;
@ -350,8 +352,6 @@ static int impl_node_enum_params(void *object, int seq,
if (param == NULL || !spa_pod_is_object_id(param, id))
continue;
found = true;
if (result.index < start)
continue;
@ -366,7 +366,8 @@ static int impl_node_enum_params(void *object, int seq,
if (count == num)
break;
}
return found ? 0 : -ENOENT;
return 0;
}
static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
@ -598,7 +599,6 @@ node_port_enum_params(struct impl *impl, int seq,
struct spa_pod_dynamic_builder b;
struct spa_result_node_params result;
uint32_t count = 0;
bool found = false;
spa_return_val_if_fail(impl != NULL, -EINVAL);
spa_return_val_if_fail(num != 0, -EINVAL);
@ -609,6 +609,9 @@ node_port_enum_params(struct impl *impl, int seq,
pw_log_debug("%p: seq:%d port %d.%d id:%u start:%u num:%u n_params:%d",
impl, seq, direction, port_id, id, start, num, port->params.n_params);
if (!pw_param_info_find(port->port->info.params, port->port->info.n_params, id))
return -ENOENT;
result.id = id;
result.next = 0;
@ -624,8 +627,6 @@ node_port_enum_params(struct impl *impl, int seq,
if (param == NULL || !spa_pod_is_object_id(param, id))
continue;
found = true;
if (result.index < start)
continue;
@ -640,7 +641,8 @@ node_port_enum_params(struct impl *impl, int seq,
if (count == num)
break;
}
return found ? 0 : -ENOENT;
return 0;
}
static int