Skip to content

Commit

Permalink
fetch-pack: close output channel after sideband demultiplexer terminates
Browse files Browse the repository at this point in the history 
fetch-pack runs the sideband demultiplexer using start_async(). This
facility requires that the asynchronously executed function closes the
output file descriptor (see Documentation/technical/api-run-command.txt).
But the sideband demultiplexer did not do that. This fixes it.

In certain error situations this could lock up a fetch operation on
Windows because the asynchronous function is run in a thread; by not
closing the output fd the reading end never got EOF and waited for more
data indefinitely. On Unix this is not a problem because the asynchronous
function is run in a separate process, which exits after the function ends
and so implicitly closes the output.

Since the pack that is sent over the wire encodes the number of objects in
the stream, during normal operation the reading end knows when the stream
ends and terminates by itself, and does not lock up.

Signed-off-by: Johannes Sixt <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
@j6t @gitster
j6t authored and gitster committed Jun 9, 2009
1 parent 956d27a commit 3ef67cf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion builtin-fetch-pack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 483,9 @@ static int sideband_demux(int fd, void *data)
{
int *xd = data;

return recv_sideband("fetch-pack", xd[0], fd);
int ret = recv_sideband("fetch-pack", xd[0], fd);
close(fd);
return ret;
}

static int get_pack(int xd[2], char **pack_lockfile)
Expand Down

0 comments on commit 3ef67cf

Please sign in to comment.