promisor-remote: fix leaking partial clone filter

The partial clone filter of a promisor remote is never free'd, causing
memory leaks. Furthermore, in case multiple partial clone filters are
defined for the same remote, we'd overwrite previous values without
freeing them.

Fix these leaks.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/promisor-remote.c b/promisor-remote.c
index 317e1b127fede4c8855559afd8547cbf558936fd..9345ae3db235fbe8d850dfd6231ae605610c31e9 100644 (file)
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -154,6 +154,7 @@ static int promisor_remote_config(const char *var, const char *value,
                if (!r)
                        return 0;
 
+               FREE_AND_NULL(r->partial_clone_filter);
                return git_config_string(&r->partial_clone_filter, var, value);
        }
 
@@ -189,6 +190,7 @@ void promisor_remote_clear(struct promisor_remote_config *config)
 {
        while (config->promisors) {
                struct promisor_remote *r = config->promisors;
+               free(r->partial_clone_filter);
                config->promisors = config->promisors->next;
                free(r);
        }

diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index 167fe661504a2b609583750884bb40a902408e04..55ed630e77ed0dada71e3a092433a7e69eb9f537 100755 (executable)
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -7,6 +7,7 @@ submodules.
 '
 
 TEST_CREATE_REPO_NO_TEMPLATE=1
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1