asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 00:25:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsactl: check for error values from snd_config_get...()

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-06-04 09:58:46 +02:00
parent 511dd7a597
commit 2bc595e7bd
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
alsactl/state.c
View file

@ -655,13 +655,16 @@ static long config_iface(snd_config_t *n)
const char *str; const char *str;
switch (snd_config_get_type(n)) { switch (snd_config_get_type(n)) {
case SND_CONFIG_TYPE_INTEGER: case SND_CONFIG_TYPE_INTEGER:
snd_config_get_integer(n, &i); if (snd_config_get_integer(n, &i) < 0)
return -1;
return i; return i;
case SND_CONFIG_TYPE_INTEGER64: case SND_CONFIG_TYPE_INTEGER64:
snd_config_get_integer64(n, &li); if (snd_config_get_integer64(n, &li) < 0)
return -1;
return li; return li;
case SND_CONFIG_TYPE_STRING: case SND_CONFIG_TYPE_STRING:
snd_config_get_string(n, &str); if (snd_config_get_string(n, &str) < 0)
return -1;
break; break;
default: default:
return -1; return -1;
@ -681,17 +684,20 @@ static int config_bool(snd_config_t *n, int doit)
switch (snd_config_get_type(n)) { switch (snd_config_get_type(n)) {
case SND_CONFIG_TYPE_INTEGER: case SND_CONFIG_TYPE_INTEGER:
snd_config_get_integer(n, &val); if (snd_config_get_integer(n, &val) < 0)
return -1;
if (val < 0 || val > 1) if (val < 0 || val > 1)
return -1; return -1;
return val; return val;
case SND_CONFIG_TYPE_INTEGER64: case SND_CONFIG_TYPE_INTEGER64:
snd_config_get_integer64(n, &lval); if (snd_config_get_integer64(n, &lval) < 0)
return -1;
if (lval < 0 || lval > 1) if (lval < 0 || lval > 1)
return -1; return -1;
return (int) lval; return (int) lval;
case SND_CONFIG_TYPE_STRING: case SND_CONFIG_TYPE_STRING:
snd_config_get_string(n, &str); if (snd_config_get_string(n, &str) < 0)
return -1;
break; break;
case SND_CONFIG_TYPE_COMPOUND: case SND_CONFIG_TYPE_COMPOUND:
if (!force_restore || !doit) if (!force_restore || !doit)
@ -718,13 +724,16 @@ static int config_enumerated(snd_config_t *n, snd_ctl_t *handle,
switch (snd_config_get_type(n)) { switch (snd_config_get_type(n)) {
case SND_CONFIG_TYPE_INTEGER: case SND_CONFIG_TYPE_INTEGER:
snd_config_get_integer(n, &val); if (snd_config_get_integer(n, &val) < 0)
return -1;
return val; return val;
case SND_CONFIG_TYPE_INTEGER64: case SND_CONFIG_TYPE_INTEGER64:
snd_config_get_integer64(n, &lval); if (snd_config_get_integer64(n, &lval) < 0)
return -1;
return (int) lval; return (int) lval;
case SND_CONFIG_TYPE_STRING: case SND_CONFIG_TYPE_STRING:
snd_config_get_string(n, &str); if (snd_config_get_string(n, &str) < 0)
return -1;
break; break;
case SND_CONFIG_TYPE_COMPOUND: case SND_CONFIG_TYPE_COMPOUND:
if (!force_restore || !doit) if (!force_restore || !doit)
@ -1247,6 +1256,8 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control,
} }
if (strcmp(fld, "iface") == 0) { if (strcmp(fld, "iface") == 0) {
iface = (snd_ctl_elem_iface_t)config_iface(n); iface = (snd_ctl_elem_iface_t)config_iface(n);
if (iface < 0)
return -EINVAL;
continue; continue;
} }
if (strcmp(fld, "device") == 0) { if (strcmp(fld, "device") == 0) {
@ -1254,7 +1265,8 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control,
cerror(doit, "control.%d.%s is invalid", numid, fld); cerror(doit, "control.%d.%s is invalid", numid, fld);
return -EINVAL; return -EINVAL;
} }
snd_config_get_integer(n, &device); if (snd_config_get_integer(n, &device) < 0)
return -EINVAL;
continue; continue;
} }
if (strcmp(fld, "subdevice") == 0) { if (strcmp(fld, "subdevice") == 0) {
@ -1262,7 +1274,8 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control,
cerror(doit, "control.%d.%s is invalid", numid, fld); cerror(doit, "control.%d.%s is invalid", numid, fld);
return -EINVAL; return -EINVAL;
} }
snd_config_get_integer(n, &subdevice); if (snd_config_get_integer(n, &subdevice) < 0)
return -EINVAL;
continue; continue;
} }
if (strcmp(fld, "name") == 0) { if (strcmp(fld, "name") == 0) {
@ -1270,7 +1283,8 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control,
cerror(doit, "control.%d.%s is invalid", numid, fld); cerror(doit, "control.%d.%s is invalid", numid, fld);
return -EINVAL; return -EINVAL;
} }
snd_config_get_string(n, &name); if (snd_config_get_string(n, &name) < 0)
return -EINVAL;
continue; continue;
} }
if (strcmp(fld, "index") == 0) { if (strcmp(fld, "index") == 0) {
@ -1278,7 +1292,8 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control,
cerror(doit, "control.%d.%s is invalid", numid, fld); cerror(doit, "control.%d.%s is invalid", numid, fld);
return -EINVAL; return -EINVAL;
} }
snd_config_get_integer(n, &index); if (snd_config_get_integer(n, &index) < 0)
return -EINVAL;
continue; continue;
} }
if (strcmp(fld, "value") == 0) { if (strcmp(fld, "value") == 0) {