]> git.alsa-project.org Git - alsa-lib.git/commitdiff
topology: fix sort_config()
authorJaroslav Kysela <perex@perex.cz>
Mon, 31 Aug 2020 12:25:56 +0000 (14:25 +0200)
committerJaroslav Kysela <perex@perex.cz>
Mon, 31 Aug 2020 12:26:02 +0000 (14:26 +0200)
The temporary config array must be initialized for all compound types.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/topology/save.c

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