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

acp: handle unset profile

Browse source 
The active profile is set to -1 initially, don't try to do anything
with the profile if it is invalid.

See rhbz#1868332
This commit is contained in:
Wim Taymans 2020-08-17 11:33:17 +02:00
parent 48a7e83fab
commit 03f1dfcf99
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
spa/plugins/alsa/alsa-acp-device.c
View file

@ -231,15 +231,20 @@ static int impl_add_listener(void *object,
spa_return_val_if_fail(events != NULL, -EINVAL);
card = this->card;
profile = card->profiles[card->active_profile_index];
if (card->active_profile_index < card->n_profiles)
profile = card->profiles[card->active_profile_index];
else
profile = NULL;
spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
if (events->info || events->object_info)
emit_info(this, true);
for (i = 0; i < profile->n_devices; i++)
emit_node(this, profile->devices[i]);
if (profile) {
for (i = 0; i < profile->n_devices; i++)
emit_node(this, profile->devices[i]);
}
spa_hook_list_join(&this->hooks, &save);
@ -441,7 +446,7 @@ static int impl_enum_params(void *object, int seq,
break;
case SPA_PARAM_Profile:
if (result.index > 0)
if (result.index > 0 || card->active_profile_index >= card->n_profiles)
return 0;
pr = card->profiles[card->active_profile_index];