ucm: coverity fixes

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

View file

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