mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

topology: fix sort_config()

Browse source 
The temporary config array must be initialized for all compound types.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-08-31 14:25:56 +02:00
parent 6ca1ddfbcd
commit 84c6aeef5c
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/topology/save.c
View file

@ -143,7 +143,6 @@ static snd_config_t *sort_config(const char *id, snd_config_t *src)
int index, array, count; int index, array, count;
if (snd_config_get_type(src) != SND_CONFIG_TYPE_COMPOUND) { if (snd_config_get_type(src) != SND_CONFIG_TYPE_COMPOUND) {
if (snd_config_copy(&dst, src) >= 0) if (snd_config_copy(&dst, src) >= 0)
return dst; return dst;
return NULL; return NULL;
@ -155,14 +154,13 @@ static snd_config_t *sort_config(const char *id, snd_config_t *src)
if (a == NULL) if (a == NULL)
return NULL; return NULL;
array = snd_config_is_array(src); array = snd_config_is_array(src);
if (array <= 0) { index = 0;
index = 0; snd_config_for_each(i, next, src) {
snd_config_for_each(i, next, src) { snd_config_t *s = snd_config_iterator_entry(i);
snd_config_t *s = snd_config_iterator_entry(i); a[index++] = s;
a[index++] = s;
}
qsort(a, count, sizeof(a[0]), _compar);
} }
if (array <= 0)
qsort(a, count, sizeof(a[0]), _compar);
if (snd_config_make_compound(&dst, id, count == 1)) { if (snd_config_make_compound(&dst, id, count == 1)) {
free(a); free(a);
return NULL; return NULL;