]> git.ipfire.org Git - thirdparty/git.git/commitdiff
submodule--helper: fix a memory leak in print_status()
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Wed, 31 Aug 2022 23:14:21 +0000 (01:14 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2022 16:18:13 +0000 (09:18 -0700)
Fix a leak in print_status(), the compute_rev_name() function
implemented in this file will return a strbuf_detach()'d value, or
NULL.

This leak has existed since this code was added in
a9f8a37584a (submodule: port submodule subcommand 'status' from shell
to C, 2017-10-06), but in 0b5e2ea7cf3 (submodule--helper: don't print
null in 'submodule status', 2018-04-18) we added a "const"
intermediate variable for the return value, that "const" should be
removed.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/submodule--helper.c

index 5c9a59083f7ba21918cc81be1870a9aeeeafee9d..23c4f8d5767e3539ee39b3735c23a32b70fc3d1f 100644 (file)
@@ -583,10 +583,11 @@ static void print_status(unsigned int flags, char state, const char *path,
        printf("%c%s %s", state, oid_to_hex(oid), displaypath);
 
        if (state == ' ' || state == '+') {
-               const char *name = compute_rev_name(path, oid_to_hex(oid));
+               char *name = compute_rev_name(path, oid_to_hex(oid));
 
                if (name)
                        printf(" (%s)", name);
+               free(name);
        }
 
        printf("\n");