From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sat, 26 Dec 2020 21:35:39 +0000 (-0700)
Subject: conf: fix use after free in _snd_config_load_with_include
X-Git-Tag: v1.2.5~147
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=5275d170e05639473e68e5feb349aec65bf26428;p=alsa-lib.git

conf: fix use after free in _snd_config_load_with_include

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

diff --git a/src/conf.c b/src/conf.c
index 7df2b4e7..44d1bfde 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1970,7 +1970,9 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
 		SNDERR("%s:%d:%d:%s", fd->name ? fd->name : "_toplevel_", fd->line, fd->column, str);
 		goto _end;
 	}
-	if (get_char(&input) != LOCAL_UNEXPECTED_EOF) {
+	err = get_char(&input);
+	fd = input.current;
+	if (err != LOCAL_UNEXPECTED_EOF) {
 		SNDERR("%s:%d:%d:Unexpected }", fd->name ? fd->name : "", fd->line, fd->column);
 		err = -EINVAL;
 		goto _end;