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

pulse-server: clients expect stream names to be non-null

Browse source 
Fixes crash in pavucontrol when media name is missing.
This commit is contained in:
Pauli Virtanen 2021-02-06 19:50:25 +02:00
parent e0557e0ca8
commit 3e9bf908ac
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3844,6 +3844,15 @@ static int fill_source_info(struct client *client, struct message *m,
return 0; return 0;
} }
static const char *get_media_name(struct pw_node_info *info)
{
const char *media_name;
media_name = spa_dict_lookup(info->props, PW_KEY_MEDIA_NAME);
if (media_name == NULL)
media_name = "";
return media_name;
}
static int fill_sink_input_info(struct client *client, struct message *m, static int fill_sink_input_info(struct client *client, struct message *m,
struct pw_manager_object *o) struct pw_manager_object *o)
{ {
@ -3873,7 +3882,7 @@ static int fill_sink_input_info(struct client *client, struct message *m,
message_put(m, message_put(m,
TAG_U32, o->id, /* sink_input index */ TAG_U32, o->id, /* sink_input index */
TAG_STRING, spa_dict_lookup(info->props, PW_KEY_MEDIA_NAME), TAG_STRING, get_media_name(info),
TAG_U32, module_id, /* module index */ TAG_U32, module_id, /* module index */
TAG_U32, client_id, /* client index */ TAG_U32, client_id, /* client index */
TAG_U32, peer ? peer->id : SPA_ID_INVALID, /* sink index */ TAG_U32, peer ? peer->id : SPA_ID_INVALID, /* sink index */
@ -3950,7 +3959,7 @@ static int fill_source_output_info(struct client *client, struct message *m,
message_put(m, message_put(m,
TAG_U32, o->id, /* source_output index */ TAG_U32, o->id, /* source_output index */
TAG_STRING, spa_dict_lookup(info->props, PW_KEY_MEDIA_NAME), TAG_STRING, get_media_name(info),
TAG_U32, module_id, /* module index */ TAG_U32, module_id, /* module index */
TAG_U32, client_id, /* client index */ TAG_U32, client_id, /* client index */
TAG_U32, peer_id, /* source index */ TAG_U32, peer_id, /* source index */