Re: [PATCH 05/20] clone: use free() instead of UNLEAK()
- From
René Scharfe <l.s.r@web.de>
- Date
- Dec 28, 2022, 18:20 UTC
- Message-ID
- <ae6c99c1-3f6d-5fa9-3a43-ab10785e2ea9@web.de>
- In-Reply-To
- <patch-05.20-49e6714939d-20221228T175512Z-avarab@gmail.com>
Am 28.12.22 um 19:00 schrieb Ævar Arnfjörð Bjarmason:
Show 34 quoted lines
> Change an UNLEAK() added in 0c4542738e6 (clone: free or UNLEAK further
> pointers when finished, 2021-03-14) to use a "to_free" pattern
> instead. In this case the "repo" can be either this absolute_pathdup()
> value, or in the "else if" branch seen in the context the the
> "argv[0]" argument to "main()".
>
> We can only free() the value in the former case, hence the "to_free"
> pattern.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> builtin/clone.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/clone.c b/builtin/clone.c
> index f518bb2dc1f..48156a4f2c2 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -892,6 +892,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
> int is_bundle = 0, is_local;
> int reject_shallow = 0;
> const char *repo_name, *repo, *work_tree, *git_dir;
> + char *repo_to_free = NULL;
> char *path = NULL, *dir, *display_repo = NULL;
> int dest_exists, real_dest_exists = 0;
> const struct ref *refs, *remote_head;
> @@ -949,7 +950,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
> path = get_repo_path(repo_name, &is_bundle);
> if (path) {
> FREE_AND_NULL(path);
> - repo = absolute_pathdup(repo_name);
> + repo = repo_to_free = absolute_pathdup(repo_name);
> } else if (strchr(repo_name, ':')) {
> repo = repo_name;Alternatively you could do "repo = xstrdup(repo_name);" here to simplify memory ownership of this string, at the cost of a small allocation. But the approach taken by this patch is fine as well.
Show 10 quoted lines
> display_repo = transport_anonymize_url(repo); > @@ -1392,7 +1393,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) > free(unborn_head); > free(dir); > free(path); > - UNLEAK(repo); > + free(repo_to_free); > junk_mode = JUNK_LEAVE_ALL; > > transport_ls_refs_options_release(&transport_ls_refs_options);