mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-plugin: make sure we don't deref NULL

Browse source 
Also fixes a warning.
This commit is contained in:
Wim Taymans 2021-10-01 15:33:51 +02:00
parent 9a76feb913
commit 3348fd9885
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pipewire-alsa/alsa-plugins/ctl_pipewire.c
View file

@ -502,7 +502,7 @@ static struct spa_pod *build_volume_mute(struct spa_pod_builder *b, struct volum
static int set_volume_mute(snd_ctl_pipewire_t *ctl, const char *name, struct volume *volume, int *mute) static int set_volume_mute(snd_ctl_pipewire_t *ctl, const char *name, struct volume *volume, int *mute)
{ {
struct global *g, *dg; struct global *g, *dg = NULL;
uint32_t id = SPA_ID_INVALID, device_id = SPA_ID_INVALID; uint32_t id = SPA_ID_INVALID, device_id = SPA_ID_INVALID;
char buf[1024]; char buf[1024];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf)); struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
@ -522,7 +522,7 @@ static int set_volume_mute(snd_ctl_pipewire_t *ctl, const char *name, struct vol
device_id = g->node.profile_device_id; device_id = g->node.profile_device_id;
} }
pw_log_debug("id %d device_id %d flags:%08x", id, device_id, g->node.flags); pw_log_debug("id %d device_id %d flags:%08x", id, device_id, g->node.flags);
if (id != SPA_ID_INVALID && device_id != SPA_ID_INVALID) { if (id != SPA_ID_INVALID && device_id != SPA_ID_INVALID && dg != NULL) {
if (!SPA_FLAG_IS_SET(dg->permissions, PW_PERM_W | PW_PERM_X)) if (!SPA_FLAG_IS_SET(dg->permissions, PW_PERM_W | PW_PERM_X))
return -EPERM; return -EPERM;