mirror of
https://github.com/git/git.git
synced 2024-11-23 01:46:13 +08:00
http-fetch: clear leaking git-index-pack(1) arguments
We never clear the arguments that we pass to git-index-pack(1). Create a common exit path and release them there to plug this leak. This is leak is exposed by t5702, but plugging the leak does not make the whole test suite pass. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6258f68c3c
commit
2ccf570efe
16
http-fetch.c
16
http-fetch.c
@ -106,6 +106,7 @@ int cmd_main(int argc, const char **argv)
|
||||
int nongit;
|
||||
struct object_id packfile_hash;
|
||||
struct strvec index_pack_args = STRVEC_INIT;
|
||||
int ret;
|
||||
|
||||
setup_git_directory_gently(&nongit);
|
||||
|
||||
@ -157,8 +158,8 @@ int cmd_main(int argc, const char **argv)
|
||||
|
||||
fetch_single_packfile(&packfile_hash, argv[arg],
|
||||
index_pack_args.v);
|
||||
|
||||
return 0;
|
||||
ret = 0;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (index_pack_args.nr)
|
||||
@ -170,7 +171,12 @@ int cmd_main(int argc, const char **argv)
|
||||
commit_id = (char **) &argv[arg++];
|
||||
commits = 1;
|
||||
}
|
||||
return fetch_using_walker(argv[arg], get_verbosely, get_recover,
|
||||
commits, commit_id, write_ref,
|
||||
commits_on_stdin);
|
||||
|
||||
ret = fetch_using_walker(argv[arg], get_verbosely, get_recover,
|
||||
commits, commit_id, write_ref,
|
||||
commits_on_stdin);
|
||||
|
||||
out:
|
||||
strvec_clear(&index_pack_args);
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user