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

pulse-server: Make sure peer_sink name is filled

Browse source 
Use 'unknown' when we can't find the peer_name. Otherwise we will just
get a protocol error when the node.name is missing.
This commit is contained in:
Wim Taymans 2024-02-19 17:39:39 +01:00
parent c51ced42b4
commit d2e4ad1ae6
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -597,6 +597,8 @@ static int reply_create_playback_stream(struct stream *stream, struct pw_manager
if (peer && pw_manager_object_is_sink(peer)) { if (peer && pw_manager_object_is_sink(peer)) {
peer_index = peer->index; peer_index = peer->index;
peer_name = pw_properties_get(peer->props, PW_KEY_NODE_NAME); peer_name = pw_properties_get(peer->props, PW_KEY_NODE_NAME);
if (peer_name == NULL)
peer_name = "unknown";
} else { } else {
peer_index = SPA_ID_INVALID; peer_index = SPA_ID_INVALID;
peer_name = NULL; peer_name = NULL;
@ -751,6 +753,8 @@ static int reply_create_record_stream(struct stream *stream, struct pw_manager_o
peer = find_linked(manager, peer->id, PW_DIRECTION_OUTPUT); peer = find_linked(manager, peer->id, PW_DIRECTION_OUTPUT);
if (peer && pw_manager_object_is_source_or_monitor(peer)) { if (peer && pw_manager_object_is_source_or_monitor(peer)) {
name = pw_properties_get(peer->props, PW_KEY_NODE_NAME); name = pw_properties_get(peer->props, PW_KEY_NODE_NAME);
if (name == NULL)
name = "unknown";
peer_index = peer->index; peer_index = peer->index;
if (!pw_manager_object_is_source(peer)) { if (!pw_manager_object_is_source(peer)) {
size_t len = (name ? strlen(name) : 5) + 10; size_t len = (name ? strlen(name) : 5) + 10;
@ -860,6 +864,8 @@ static void manager_added(void *data, struct pw_manager_object *o)
s->peer_index = peer->index; s->peer_index = peer->index;
peer_name = pw_properties_get(peer->props, PW_KEY_NODE_NAME); peer_name = pw_properties_get(peer->props, PW_KEY_NODE_NAME);
if (peer_name == NULL)
peer_name = "unknown";
if (peer_name && s->direction == PW_DIRECTION_INPUT && if (peer_name && s->direction == PW_DIRECTION_INPUT &&
pw_manager_object_is_monitor(peer)) { pw_manager_object_is_monitor(peer)) {
int len = strlen(peer_name) + 10; int len = strlen(peer_name) + 10;