OSDN Git Service

ucm: fix memory leaks detected by the coverity checker
authorJaroslav Kysela <perex@perex.cz>
Fri, 15 Nov 2019 11:52:36 +0000 (12:52 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 15 Nov 2019 11:52:36 +0000 (12:52 +0100)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/ucm/parser.c
src/ucm/ucm_subs.c

index afd2033..ed790dc 100644 (file)
@@ -650,8 +650,10 @@ static int parse_value(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED,
                        return -EINVAL;
                }
                err = uc_mgr_add_value(base, id, s);
-               if (err < 0)
+               if (err < 0) {
+                       free(s);
                        return err;
+               }
        }
 
        return 0;
@@ -1761,15 +1763,18 @@ int uc_mgr_scan_master_configs(const char **_list[])
                err = snd_config_search(cfg, "Syntax", &c);
                if (err < 0) {
                        uc_error("Syntax field not found in %s", d_name);
+                       snd_config_delete(cfg);
                        continue;
                }
                err = snd_config_get_integer(c, &l);
                if (err < 0) {
                        uc_error("Syntax field is invalid in %s", d_name);
+                       snd_config_delete(cfg);
                        goto __err;
                }
                if (l < 2 || l > SYNTAX_VERSION_MAX) {
                        uc_error("Incompatible syntax %d in %s", l, d_name);
+                       snd_config_delete(cfg);
                        goto __err;
                }
                err = snd_config_search(cfg, "Comment", &c);
index c26fe08..f20c8e2 100644 (file)
@@ -158,6 +158,7 @@ __rval:
                        if (nsize > size) {
                                nr = realloc(r, nsize);
                                if (nr == NULL) {
+                                       free(rval);
                                        err = -ENOMEM;
                                        goto __error;
                                }