mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-06 06:46:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: handle channel map allocation errors

Browse source
This commit is contained in:
Wim Taymans 2026-05-05 13:09:41 +02:00
parent 7bfc820ae8
commit 24f9b9a335
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spa/plugins/alsa/acp/acp.c
View file

@ -227,7 +227,8 @@ static void init_device(pa_card *impl, pa_alsa_device *dev, pa_alsa_direction_t
dev->device.format.rate_mask = m->sample_spec.rate;
dev->device.format.channels = m->channel_map.channels;
dev->device.format.map = calloc(m->channel_map.channels, sizeof(uint32_t));
channelmap_to_acp(&m->channel_map, dev->device.format.map);
if (dev->device.format.map != NULL)
channelmap_to_acp(&m->channel_map, dev->device.format.map);
pa_cvolume_reset(&dev->real_volume, dev->device.format.channels);
pa_cvolume_reset(&dev->soft_volume, dev->device.format.channels);
dev->direction = direction;
@ -1744,6 +1745,8 @@ static int device_enable(pa_card *impl, pa_alsa_mapping *mapping, pa_alsa_device
dev->device.format.channels = atoi(channels);
free(dev->device.format.map);
dev->device.format.map = calloc(dev->device.format.channels, sizeof(uint32_t));
if (dev->device.format.map == NULL)
break;
while ((position = pa_split_in_place(positions, ",", &n, &split_state)) != NULL &&
i < dev->device.format.channels) {