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

ucm: fix memory leaks detected by the coverity checker

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-11-15 12:52:36 +01:00
parent 6fbf87c402
commit 6a76c01a01
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ucm/parser.c
View file

@ -650,9 +650,11 @@ static int parse_value(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED,
return -EINVAL; return -EINVAL;
} }
err = uc_mgr_add_value(base, id, s); err = uc_mgr_add_value(base, id, s);
if (err < 0) if (err < 0) {
free(s);
return err; return err;
} }
}
return 0; return 0;
} }
@ -1761,15 +1763,18 @@ int uc_mgr_scan_master_configs(const char **_list[])
err = snd_config_search(cfg, "Syntax", &c); err = snd_config_search(cfg, "Syntax", &c);
if (err < 0) { if (err < 0) {
uc_error("Syntax field not found in %s", d_name); uc_error("Syntax field not found in %s", d_name);
snd_config_delete(cfg);
continue; continue;
} }
err = snd_config_get_integer(c, &l); err = snd_config_get_integer(c, &l);
if (err < 0) { if (err < 0) {
uc_error("Syntax field is invalid in %s", d_name); uc_error("Syntax field is invalid in %s", d_name);
snd_config_delete(cfg);
goto __err; goto __err;
} }
if (l < 2 || l > SYNTAX_VERSION_MAX) { if (l < 2 || l > SYNTAX_VERSION_MAX) {
uc_error("Incompatible syntax %d in %s", l, d_name); uc_error("Incompatible syntax %d in %s", l, d_name);
snd_config_delete(cfg);
goto __err; goto __err;
} }
err = snd_config_search(cfg, "Comment", &c); err = snd_config_search(cfg, "Comment", &c);

1
src/ucm/ucm_subs.c
View file

@ -158,6 +158,7 @@ __rval:
if (nsize > size) { if (nsize > size) {
nr = realloc(r, nsize); nr = realloc(r, nsize);
if (nr == NULL) { if (nr == NULL) {
free(rval);
err = -ENOMEM; err = -ENOMEM;
goto __error; goto __error;
} }