urlmatch.c: add and use a *_release() function

Plug a memory leak in credential_apply_config() by adding and using a
new urlmatch_config_release() function. This just does a
string_list_clear() on the "vars" member.

This finished up work on normalizing the init/free pattern in this
API, started in 73ee449bbf2 (urlmatch.[ch]: add and use
URLMATCH_CONFIG_INIT, 2021-10-01).

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

diff --git a/builtin/config.c b/builtin/config.c
index 542d8d02b2b00a8675d6bff9245019d0251d043f..ebec61868bea48149e4e4c49ef3df02bb45fc6e0 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -612,7 +612,7 @@ static int get_urlmatch(const char *var, const char *url)
 
                strbuf_release(&matched->value);
        }
-       string_list_clear(&config.vars, 1);
+       urlmatch_config_release(&config);
        string_list_clear(&values, 1);
        free(config.url.url);
 

diff --git a/credential.c b/credential.c
index e7240f3f636f9d687836b7fe6df65b548ce285fd..f6389a50684a6e99bad1fe39b04a96fb99abc726 100644 (file)
--- a/credential.c
+++ b/credential.c
@@ -130,6 +130,7 @@ static void credential_apply_config(struct credential *c)
        git_config(urlmatch_config_entry, &config);
        string_list_clear(&config.vars, 1);
        free(normalized_url);
+       urlmatch_config_release(&config);
        strbuf_release(&url);
 
        c->configured = 1;

diff --git a/urlmatch.c b/urlmatch.c
index 03ad3f30a9c09f793aa94cac1fa2730cf4180b45..b615adc923ae019b756e25a1cdcfb251333e69ff 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -611,3 +611,8 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
        strbuf_release(&synthkey);
        return retval;
 }
+
+void urlmatch_config_release(struct urlmatch_config *config)
+{
+       string_list_clear(&config->vars, 1);
+}

diff --git a/urlmatch.h b/urlmatch.h
index 34a3ba6d1973b4aa8d82a2af7fab8b6672433cc5..9f40b00bfb82b1f32bf75e60538be145bbe9d116 100644 (file)
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -71,5 +71,6 @@ struct urlmatch_config {
 }
 
 int urlmatch_config_entry(const char *var, const char *value, void *cb);
+void urlmatch_config_release(struct urlmatch_config *config);
 
 #endif /* URL_MATCH_H */