diff options
| author | Jens Lindstrom <jl@opera.com> | 2013-10-22 15:36:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-23 09:07:09 -0700 |
| commit | 37cb1dd671e5e22cee363f98637a5a58f16be054 (patch) | |
| tree | acf25b123b55691bac708b8fa0e5cd3e9c7b75fe /send-pack.c | |
| parent | 5f737ac91bd869e65bff401ad1108581ac504e22 (diff) | |
| download | git-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 'send-pack.c')
| -rw-r--r-- | send-pack.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/send-pack.c b/send-pack.c index 7d172ef37f..edbfd076a9 100644 --- a/send-pack.c +++ b/send-pack.c @@ -300,8 +300,12 @@ int send_pack(struct send_pack_args *args, shutdown(fd[0], SHUT_WR); if (use_sideband) finish_async(&demux); + fd[1] = -1; return -1; } + if (!args->stateless_rpc) + /* Closed by pack_objects() via start_command() */ + fd[1] = -1; } if (args->stateless_rpc && cmds_sent) packet_flush(out); |