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

link-factory: check that the port belongs to the node

Browse source 
When both node and port are given, check that the port belongs to the
node. If it doesn't, it could be that we found a Port using the
object.id but we should have used the port.id of the node.
This commit is contained in:
Wim Taymans 2025-02-14 10:54:13 +01:00
parent cfddbb033a
commit 152acf69c2
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/module-link-factory.c
View file

@ -47,7 +47,9 @@
* specified.
* - `link.output.port`: The output port to link. This can be a port object.id, port.name,
* port.alias or object.path. If an output node is specified, the
* port must belong to the node. If no output port is given, an
* port must belong to the node and if no port was found using the
* object.id, port.name, port.alias or object.path, the port.id is
* used to find the port in the node. If no output port is given, an
* output node must be specified and a random (unlinked) port will
* be used from the node.
* - `link.input.node`: The input node to use. This can be the node object.id, node.name,
@ -56,7 +58,9 @@
* specified.
* - `link.input.port`: The input port to link. This can be a port object.id, port.name,
* port.alias or object.path. If an input node is specified, the
* port must belong to the node. If no input port is given, an
* port must belong to the node and if no port was found using the
* object.id, port.name, port.alias or object.path, the port.id is
* used to find the port in the node. If no input port is given, an
* input node must be specified and a random (unlinked) port will
* be used from the node.
* - `object.linger`: Keep the link around even when the client that created it is gone.
@ -368,8 +372,12 @@ static struct pw_impl_port *find_port(struct pw_context *context,
if (find.id != SPA_ID_INVALID) {
struct pw_global *global = pw_context_find_global(context, find.id);
/* find port by global id */
if (global != NULL && pw_global_is_type(global, PW_TYPE_INTERFACE_Port))
return pw_global_get_object(global);
if (global != NULL && pw_global_is_type(global, PW_TYPE_INTERFACE_Port)) {
find.port = pw_global_get_object(global);
if (find.port != NULL &&
(node == NULL || pw_impl_port_get_node(find.port) == node))
return find.port;
}
}
if (node != NULL) {
/* find port by local id */