diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-02-22 23:55:45 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-02-22 23:55:45 +0100 |
commit | 72972ea0b978f20b335339d18e497da617398967 (patch) | |
tree | 770e98011633bc27a1ef54b51cd2752b0f80acc6 /bundle.c | |
parent | Merge branch 'jk/doc-ls-remote-matching' (diff) | |
parent | push: free_refs() the "local_refs" in set_refspecs() (diff) | |
download | git-72972ea0b978f20b335339d18e497da617398967.tar.xz git-72972ea0b978f20b335339d18e497da617398967.zip |
Merge branch 'ab/various-leak-fixes'
Leak fixes.
* ab/various-leak-fixes:
push: free_refs() the "local_refs" in set_refspecs()
push: refactor refspec_append_mapped() for subsequent leak-fix
receive-pack: release the linked "struct command *" list
grep API: plug memory leaks by freeing "header_list"
grep.c: refactor free_grep_patterns()
builtin/merge.c: free "&buf" on "Your local changes..." error
builtin/merge.c: use fixed strings, not "strbuf", fix leak
show-branch: free() allocated "head" before return
commit-graph: fix a parse_options_concat() leak
http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main()
worktree: fix a trivial leak in prune_worktrees()
repack: fix leaks on error with "goto cleanup"
name-rev: don't xstrdup() an already dup'd string
various: add missing clear_pathspec(), fix leaks
clone: use free() instead of UNLEAK()
commit-graph: use free_commit_graph() instead of UNLEAK()
bundle.c: don't leak the "args" in the "struct child_process"
tests: mark tests as passing with SANITIZE=leak
Diffstat (limited to 'bundle.c')
-rw-r--r-- | bundle.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -610,6 +610,10 @@ int unbundle(struct repository *r, struct bundle_header *header, enum verify_bundle_flags flags) { struct child_process ip = CHILD_PROCESS_INIT; + + if (verify_bundle(r, header, flags)) + return -1; + strvec_pushl(&ip.args, "index-pack", "--fix-thin", "--stdin", NULL); /* If there is a filter, then we need to create the promisor pack. */ @@ -621,8 +625,6 @@ int unbundle(struct repository *r, struct bundle_header *header, strvec_clear(extra_index_pack_args); } - if (verify_bundle(r, header, flags)) - return -1; ip.in = bundle_fd; ip.no_stdout = 1; ip.git_cmd = 1; |