diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:45 -0700 |
| commit | 832ee79ab89d5908bcfd6fda89eacb0e665de2ef (patch) | |
| tree | cd4bb21850218356ef07a7a545bad3a5ea908a18 /send-pack.c | |
| parent | 02882bc8344b851f7f371905678bb5c88b8eaea6 (diff) | |
| parent | 37cb1dd671e5e22cee363f98637a5a58f16be054 (diff) | |
| download | git-832ee79ab89d5908bcfd6fda89eacb0e665de2ef.tar.gz | |
Merge branch 'jl/pack-transfer-avoid-double-close'
The codepath that send_pack() calls pack_objects() mistakenly
closed the same file descriptor twice, leading to potentially
closing a wrong file descriptor that was opened in the meantime.
* jl/pack-transfer-avoid-double-close:
Clear fd after closing to avoid double-close error
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 b228d65613..fab62e3da0 100644 --- a/send-pack.c +++ b/send-pack.c @@ -302,8 +302,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); |