]> git.alsa-project.org Git - alsa-lib.git/commitdiff
confmisc: fix memory leak in snd_func_concat
authorAlex Henrie <alexhenrie24@gmail.com>
Mon, 28 Dec 2020 01:43:15 +0000 (18:43 -0700)
committerTakashi Iwai <tiwai@suse.de>
Tue, 29 Dec 2020 08:23:07 +0000 (09:23 +0100)
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/confmisc.c

index eb8218c1e150019ddbcb2392632f0b64126fda9f..3ce95c7a942cb3898c5dfa192ce3d6de849856d7 100644 (file)
@@ -419,7 +419,6 @@ int snd_func_concat(snd_config_t **dst, snd_config_t *root, snd_config_t *src,
                                tmp = realloc(res, len + len1 + 1);
                                if (tmp == NULL) {
                                        free(ptr);
-                                       free(res);
                                        err = -ENOMEM;
                                        goto __error;
                                }
@@ -440,8 +439,8 @@ int snd_func_concat(snd_config_t **dst, snd_config_t *root, snd_config_t *src,
        err = snd_config_get_id(src, &id);
        if (err >= 0)
                err = snd_config_imake_string(dst, id, res);
-       free(res);
       __error:
+       free(res);
        return err;
 }
 #ifndef DOC_HIDDEN