From 7036ea07c88b0abe8866e713eaf123971c5ba235 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 15 Jun 2020 19:49:25 +0200 Subject: [PATCH] ucm: include - fix compound_merge for arrays There is a case where the original array has already new indexes (the merged array is placed before the original nodes). Set the temporary index string identifiers to unique strings. Signed-off-by: Jaroslav Kysela --- src/ucm/ucm_include.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ucm/ucm_include.c b/src/ucm/ucm_include.c index 345e4cc9..c69490f4 100644 --- a/src/ucm/ucm_include.c +++ b/src/ucm/ucm_include.c @@ -149,6 +149,18 @@ static int compound_merge(const char *id, } idx = 0; + + /* for array, use a temporary non-clashing identifier */ + if (array > 0) { + snd_config_for_each(i, next, dst) { + n = snd_config_iterator_entry(i); + snprintf(tmpid, sizeof(tmpid), "_tmp_%d", idx++); + err = snd_config_set_id(n, tmpid); + if (err < 0) + return err; + } + } + snd_config_for_each(i, next, src) { n = snd_config_iterator_entry(i); err = snd_config_remove(n); -- 2.47.1