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: fix check type, then check info

Browse source 
If the object is not of the right type, the info might not be of
the right type and we should not deref it.
This commit is contained in:
Wim Taymans 2020-11-13 17:38:23 +01:00
parent b8b2ce6ba9
commit 1d8bef1133
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3069,7 +3069,7 @@ static int fill_client_info(struct client *client, struct message *m,
const char *str; const char *str;
uint32_t module_id = SPA_ID_INVALID; uint32_t module_id = SPA_ID_INVALID;
if (info == NULL || info->props == NULL || !is_client(o)) if (!is_client(o) || info == NULL || info->props == NULL)
return -ENOENT; return -ENOENT;
if ((str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID)) != NULL) if ((str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID)) != NULL)
@ -3094,7 +3094,7 @@ static int fill_module_info(struct client *client, struct message *m,
{ {
struct pw_module_info *info = o->info; struct pw_module_info *info = o->info;
if (info == NULL || info->props == NULL || !is_module(o)) if (!is_module(o) || info == NULL || info->props == NULL)
return -ENOENT; return -ENOENT;
message_put(m, message_put(m,
@ -3126,7 +3126,7 @@ static int fill_card_info(struct client *client, struct message *m,
struct card_info card_info = CARD_INFO_INIT; struct card_info card_info = CARD_INFO_INIT;
struct profile_info *profile_info; struct profile_info *profile_info;
if (info == NULL || info->props == NULL || !is_card(o)) if (!is_card(o) || info == NULL || info->props == NULL)
return -ENOENT; return -ENOENT;
if ((str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID)) != NULL) if ((str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID)) != NULL)
@ -3245,7 +3245,7 @@ static int fill_sink_info(struct client *client, struct message *m,
struct card_info card_info = CARD_INFO_INIT; struct card_info card_info = CARD_INFO_INIT;
struct device_info dev_info = DEVICE_INFO_INIT(PW_DIRECTION_OUTPUT); struct device_info dev_info = DEVICE_INFO_INIT(PW_DIRECTION_OUTPUT);
if (info == NULL || info->props == NULL || !is_sink(o)) if (!is_sink(o) || info == NULL || info->props == NULL)
return -ENOENT; return -ENOENT;
if ((name = spa_dict_lookup(info->props, PW_KEY_NODE_NAME)) != NULL) { if ((name = spa_dict_lookup(info->props, PW_KEY_NODE_NAME)) != NULL) {
@ -3368,8 +3368,7 @@ static int fill_source_info(struct client *client, struct message *m,
struct device_info dev_info = DEVICE_INFO_INIT(PW_DIRECTION_INPUT); struct device_info dev_info = DEVICE_INFO_INIT(PW_DIRECTION_INPUT);
is_monitor = is_sink(o); is_monitor = is_sink(o);
if (info == NULL || info->props == NULL || if ((!is_source(o) && !is_monitor) || info == NULL || info->props == NULL)
(!is_source(o) && !is_monitor))
return -ENOENT; return -ENOENT;
if ((name = spa_dict_lookup(info->props, PW_KEY_NODE_NAME)) != NULL) { if ((name = spa_dict_lookup(info->props, PW_KEY_NODE_NAME)) != NULL) {
@ -3491,7 +3490,7 @@ static int fill_sink_input_info(struct client *client, struct message *m,
uint32_t module_id = SPA_ID_INVALID, client_id = SPA_ID_INVALID; uint32_t module_id = SPA_ID_INVALID, client_id = SPA_ID_INVALID;
struct device_info dev_info = DEVICE_INFO_INIT(PW_DIRECTION_OUTPUT); struct device_info dev_info = DEVICE_INFO_INIT(PW_DIRECTION_OUTPUT);
if (info == NULL || info->props == NULL || !is_sink_input(o)) if (!is_sink_input(o) || info == NULL || info->props == NULL)
return -ENOENT; return -ENOENT;
if ((str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID)) != NULL) if ((str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID)) != NULL)
@ -3556,7 +3555,7 @@ static int fill_source_output_info(struct client *client, struct message *m,
uint32_t peer_id; uint32_t peer_id;
struct device_info dev_info = DEVICE_INFO_INIT(PW_DIRECTION_INPUT); struct device_info dev_info = DEVICE_INFO_INIT(PW_DIRECTION_INPUT);
if (info == NULL || info->props == NULL || !is_source_output(o)) if (!is_source_output(o) || info == NULL || info->props == NULL)
return -ENOENT; return -ENOENT;
if ((str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID)) != NULL) if ((str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID)) != NULL)