]> git.ipfire.org Git - thirdparty/git.git/commitdiff
clone: use free() instead of UNLEAK()
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Mon, 6 Feb 2023 23:07:39 +0000 (00:07 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Feb 2023 23:34:37 +0000 (15:34 -0800)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/clone.c

index 5453ba5277f968cbac419b7aee9911182beb41e6..ba82f5e4108eae9fc2b737248daa2bb8f344ac4d 100644 (file)
@@ -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;
                display_repo = transport_anonymize_url(repo);
@@ -1413,7 +1414,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);