From: Alex Henrie <alexhenrie24@gmail.com>
Date: Mon, 28 Dec 2020 01:43:15 +0000 (-0700)
Subject: confmisc: fix memory leak in snd_func_concat
X-Git-Tag: v1.2.5~139
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=a92ad2fea4b36d7282f4a571275fb492dd1bba75;p=alsa-lib.git

confmisc: fix memory leak in snd_func_concat

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/src/confmisc.c b/src/confmisc.c
index eb8218c1..3ce95c7a 100644
--- a/src/confmisc.c
+++ b/src/confmisc.c
@@ -419,7 +419,6 @@ int snd_func_concat(snd_config_t **dst, snd_config_t *root, snd_config_t *src,
 				tmp = realloc(res, len + len1 + 1);
 				if (tmp == NULL) {
 					free(ptr);
-					free(res);
 					err = -ENOMEM;
 					goto __error;
 				}
@@ -440,8 +439,8 @@ int snd_func_concat(snd_config_t **dst, snd_config_t *root, snd_config_t *src,
 	err = snd_config_get_id(src, &id);
 	if (err >= 0)
 		err = snd_config_imake_string(dst, id, res);
-	free(res);
       __error:
+	free(res);
 	return err;
 }
 #ifndef DOC_HIDDEN