| Message ID | 6952fb2ff2cf453de39b63883a716a9f09cab7b7.1721995576.git.ps@pks.im (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Memory leak fixes (pt.3) | expand |
On Fri, Jul 26, 2024 at 02:15:36PM +0200, Patrick Steinhardt wrote: > @@ -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); I stared at this for longer than I'd like to admit wondering if there was a whitespace error in the pre-image or something. But I see you just moved initializing 'name' next to the initialization of 'item'. I'd argue that might be a stray diff, but I don't think it matters much. > 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; > } The patch looks good to me otherwise. Thanks, Taylor
diff --git a/builtin/remote.c b/builtin/remote.c index 08292498bd..303da7f73f 100644 --- 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; }
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> --- builtin/remote.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)