summaryrefslogtreecommitdiff
path: root/fetch-pack.c
diff options
context:
space:
mode:
authorJens Lindstrom <jl@opera.com>2013-10-22 15:36:02 +0200
committerJunio C Hamano <gitster@pobox.com>2013-10-23 09:07:09 -0700
commit37cb1dd671e5e22cee363f98637a5a58f16be054 (patch)
treeacf25b123b55691bac708b8fa0e5cd3e9c7b75fe /fetch-pack.c
parent5f737ac91bd869e65bff401ad1108581ac504e22 (diff)
downloadgit-37cb1dd671e5e22cee363f98637a5a58f16be054.tar.gz
Clear fd after closing to avoid double-close errorjl/pack-transfer-avoid-double-close
In send_pack(), clear the fd passed to pack_objects() by setting it to -1, since pack_objects() closes the fd (via a call to run_command()). Likewise, in get_pack(), clear the fd passed to run_command(). Not doing so risks having git_transport_push(), caller of send_pack(), closing the fd again, possibly incorrectly closing some other open file; or similarly with fetch_refs_from_pack(), indirect caller of get_pack(). Signed-off-by: Jens Lindström <jl@opera.com> Acked-by: Jeff King <peff@peff.net> Acked-by: Duy Nguyen <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fetch-pack.c')
-rw-r--r--fetch-pack.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index f5d99c1181..29b711a98b 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -776,6 +776,10 @@ static int get_pack(struct fetch_pack_args *args,
close(cmd.out);
}
+ if (!use_sideband)
+ /* Closed by start_command() */
+ xd[0] = -1;
+
ret = finish_command(&cmd);
if (!ret || (args->check_self_contained_and_connected && ret == 1))
args->self_contained_and_connected =