check-ref-format: fix trivial memory leak

Fix a memory leak in "git check-ref-format" that's been present in the
code in one form or another since 38eedc634bc (git check-ref-format
--print, 2009-10-12), the code got substantially refactored in
cfbe22f03f9 (check-ref-format: handle subcommands in separate
functions, 2010-08-05).

As a result we can mark a test as passing with SANITIZE=leak using
"TEST_PASSES_SANITIZE_LEAK=true".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index bc67d3f0a83d35b2fc6d81f28c6908075564644a..fd0e5f86832a0ed4d9c08512291c836938f2bec2 100644 (file)
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -57,6 +57,8 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
        int normalize = 0;
        int flags = 0;
        const char *refname;
+       char *to_free = NULL;
+       int ret = 1;
 
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage(builtin_check_ref_format_usage);
@@ -81,11 +83,14 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
 
        refname = argv[i];
        if (normalize)
-               refname = collapse_slashes(refname);
+               refname = to_free = collapse_slashes(refname);
        if (check_refname_format(refname, flags))
-               return 1;
+               goto cleanup;
        if (normalize)
                printf("%s\n", refname);
 
-       return 0;
+       ret = 0;
+cleanup:
+       free(to_free);
+       return ret;
 }

diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
index cabc516ae9a4fa1c404c245f4b3b9efd7e93200e..5ed9d7318e0cc97435952039c7e8c1af842a24a9 100755 (executable)
--- a/t/t1402-check-ref-format.sh
+++ b/t/t1402-check-ref-format.sh
@@ -2,6 +2,7 @@
 
 test_description='Test git check-ref-format'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 valid_ref() {