From 37cb1dd671e5e22cee363f98637a5a58f16be054 Mon Sep 17 00:00:00 2001 From: Jens Lindstrom Date: Tue, 22 Oct 2013 15:36:02 +0200 Subject: Clear fd after closing to avoid double-close error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Jeff King Acked-by: Duy Nguyen Signed-off-by: Junio C Hamano --- send-pack.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'send-pack.c') 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); -- cgit v1.2.3