builtin/remote: fix leaking strings in `branch_list`

The `struct string_list branch_list` is declared as `NODUP`, which makes
it not copy strings inserted into it. This causes memory leaks though,
as this means it also won't be responsible for _freeing_ inserted
strings. Thus, every branch we add to this will leak.

Fix this by marking the list as `DUP` instead and free the local copy we
have of the variable.

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

diff --git a/builtin/remote.c b/builtin/remote.c
index 08292498bdebcafb603f140933166d8b1af12b6f..303da7f73fc841c56fd48a46d7044c654410de02 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -258,7 +258,7 @@ struct branch_info {
        char *push_remote_name;
 };
 
-static struct string_list branch_list = STRING_LIST_INIT_NODUP;
+static struct string_list branch_list = STRING_LIST_INIT_DUP;
 
 static const char *abbrev_ref(const char *name, const char *prefix)
 {
@@ -292,8 +292,8 @@ static int config_read_branches(const char *key, const char *value,
                type = PUSH_REMOTE;
        else
                return 0;
-       name = xmemdupz(key, key_len);
 
+       name = xmemdupz(key, key_len);
        item = string_list_insert(&branch_list, name);
 
        if (!item->util)
@@ -337,6 +337,7 @@ static int config_read_branches(const char *key, const char *value,
                BUG("unexpected type=%d", type);
        }
 
+       free(name);
        return 0;
 }