mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-01 01:40:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: coverity fixes

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-05-24 21:11:00 +02:00
parent 0d97f53c25
commit ed156a2186
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ucm/parser.c
View file

@ -1114,7 +1114,7 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
if (err < 0) { if (err < 0) {
uc_error("error: %s failed to parse verb", uc_error("error: %s failed to parse verb",
file); file);
return err; goto _err;
} }
continue; continue;
} }
@ -1126,7 +1126,7 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
if (err < 0) { if (err < 0) {
uc_error("error: %s failed to parse device", uc_error("error: %s failed to parse device",
file); file);
return err; goto _err;
} }
continue; continue;
} }
@ -1138,18 +1138,24 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
if (err < 0) { if (err < 0) {
uc_error("error: %s failed to parse modifier", uc_error("error: %s failed to parse modifier",
file); file);
return err; goto _err;
} }
continue; continue;
} }
} }
snd_config_delete(cfg);
/* use case verb must have at least 1 device */ /* use case verb must have at least 1 device */
if (list_empty(&verb->device_list)) { if (list_empty(&verb->device_list)) {
uc_error("error: no use case device defined", file); uc_error("error: no use case device defined", file);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
_err:
snd_config_delete(cfg);
return err;
} }
/* /*
@ -1399,6 +1405,7 @@ next_card:
return -1; return -1;
} }
static int load_master_config(const char *card_name, snd_config_t **cfg) static int load_master_config(const char *card_name, snd_config_t **cfg)
{ {
char filename[MAX_FILE]; char filename[MAX_FILE];
@ -1610,8 +1617,11 @@ int uc_mgr_scan_master_configs(const char **_list[])
} }
free(namelist); free(namelist);
if (err >= 0) if (err >= 0) {
*_list = list; *_list = list;
} else {
free(list);
}
return err; return err;
} }

12
src/ucm/utils.c
View file

@ -58,14 +58,18 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
int err; int err;
fp = fopen(file, "r"); fp = fopen(file, "r");
err = fp == NULL ? -errno : snd_input_stdio_attach(&in, fp, 1); if (!fp) {
if (err < 0) { err = -errno;
__err0:
uc_error("could not open configuration file %s", file); uc_error("could not open configuration file %s", file);
return err; return err;
} }
err = snd_input_stdio_attach(&in, fp, 1);
if (err < 0)
goto __err0;
err = snd_config_top(&top); err = snd_config_top(&top);
if (err < 0) if (err < 0)
return err; goto __err1;
default_path = getenv(ALSA_CONFIG_UCM_VAR); default_path = getenv(ALSA_CONFIG_UCM_VAR);
if (!default_path || !*default_path) if (!default_path || !*default_path)
@ -88,6 +92,8 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
__err2: __err2:
snd_config_delete(top); snd_config_delete(top);
__err1:
snd_input_close(in);
return err; return err;
} }