From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 12 May 2021 08:07:12 +0000 (+0200)
Subject: conf: fix snd_config_merge() - double free in overwrite mode
X-Git-Tag: v1.2.5~28
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=1a52373fbc9414a8e8ec9d1470c0879e1c09fcec;p=alsa-lib.git

conf: fix snd_config_merge() - double free in overwrite mode

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/conf.c b/src/conf.c
index 12aad1a9..1ddf7e69 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -2194,6 +2194,7 @@ int snd_config_merge(snd_config_t *dst, snd_config_t *src, int override)
 			snd_config_t *dn = snd_config_iterator_entry(di);
 			if (strcmp(sn->id, dn->id) == 0) {
 				if (override) {
+					snd_config_remove(sn);
 					err = snd_config_substitute(dn, sn);
 					if (err < 0)
 						return err;