mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: fix the '${eval:EXPR}' substitution

Browse source 
There was already a variable substitution. Skip it for the eval: case.

Fixes: 7b6da9ee ("ucm: add ${eval:EXPR} substitution (Syntax 5)")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2022-02-22 09:50:30 +01:00
parent 3dbe072d8d
commit c41d710a69
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ucm/ucm_subs.c
View file

@ -727,6 +727,8 @@ __match2:
strncpy_with_escape(v2, value + idsize, rvalsize);
idsize += rvalsize + 1;
if (*v2 == '$' && uc_mgr->conf_format >= 3) {
if (strncmp(value, "${eval:", 7) == 0)
goto __direct_fcn2;
tmp = uc_mgr_get_variable(uc_mgr, v2 + 1);
if (tmp == NULL) {
uc_error("define '%s' is not reachable in this context!", v2 + 1);
@ -735,6 +737,7 @@ __match2:
rval = fcn2(uc_mgr, tmp);
}
} else {
__direct_fcn2:
rval = fcn2(uc_mgr, v2);
}
goto __rval;