From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 3 Jul 2020 12:48:18 +0000 (+0200)
Subject: ucm: fix parse_get_safe_name() - safe name must be checked after substitution
X-Git-Tag: v1.2.4~48
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=30d12e930cfcba777a29af502a9c1dbfa5e37c04;p=alsa-lib.git

ucm: fix parse_get_safe_name() - safe name must be checked after substitution

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

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 3b7fc931..d034b859 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -234,9 +234,14 @@ int parse_get_safe_name(snd_use_case_mgr_t *uc_mgr, snd_config_t *n,
 		if (err < 0)
 			return err;
 	}
-	if (!parse_is_name_safe(id))
+	err = get_string3(uc_mgr, id, name);
+	if (err < 0)
+		return err;
+	if (!parse_is_name_safe(*name)) {
+		free(*name);
 		return -EINVAL;
-	return get_string3(uc_mgr, id, name);
+	}
+	return 0;
 }
 
 /*