test-tool urlmatch-normalization: fix a memory leak

Fix a memory leak in "test-tool urlmatch-normalization", as a result
we can mark the corresponding 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/t/helper/test-urlmatch-normalization.c b/t/helper/test-urlmatch-normalization.c
index 8f4d67e646953c5b094b55ec8112f6ba3b9b9024..86edd454f5c9e86f516f564868d94b1859b524f7 100644 (file)
--- a/t/helper/test-urlmatch-normalization.c
+++ b/t/helper/test-urlmatch-normalization.c
@@ -5,8 +5,9 @@
 int cmd__urlmatch_normalization(int argc, const char **argv)
 {
        const char usage[] = "test-tool urlmatch-normalization [-p | -l] <url1> | <url1> <url2>";
-       char *url1, *url2;
+       char *url1 = NULL, *url2 = NULL;
        int opt_p = 0, opt_l = 0;
+       int ret = 0;
 
        /*
         * For one url, succeed if url_normalize succeeds on it, fail otherwise.
@@ -39,7 +40,7 @@ int cmd__urlmatch_normalization(int argc, const char **argv)
                        printf("%s\n", url1);
                if (opt_l)
                        printf("%u\n", (unsigned)info.url_len);
-               return 0;
+               goto cleanup;
        }
 
        if (opt_p || opt_l)
@@ -47,5 +48,9 @@ int cmd__urlmatch_normalization(int argc, const char **argv)
 
        url1 = url_normalize(argv[1], NULL);
        url2 = url_normalize(argv[2], NULL);
-       return (url1 && url2 && !strcmp(url1, url2)) ? 0 : 1;
+       ret = (url1 && url2 && !strcmp(url1, url2)) ? 0 : 1;
+cleanup:
+       free(url1);
+       free(url2);
+       return ret;
 }

diff --git a/t/t0110-urlmatch-normalization.sh b/t/t0110-urlmatch-normalization.sh
index 4dc9fecf7241ef416c7dfa0616d6d9df491fe673..12d817fbd34002cf5e8cd6561551b23303c27f6f 100755 (executable)
--- a/t/t0110-urlmatch-normalization.sh
+++ b/t/t0110-urlmatch-normalization.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='urlmatch URL normalization'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # The base name of the test url files