On Tue, Oct 22, 2013 at 8:36 PM, Jens Lindström <jl@xxxxxxxxx> wrote: > From: Jens Lindstrom <jl@xxxxxxxxx> > > 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@xxxxxxxxx> > --- > fetch-pack.c | 4 ++++ > send-pack.c | 4 ++++ > 2 files changed, 8 insertions(+) > > diff --git a/fetch-pack.c b/fetch-pack.c > index f5d99c1..29b711a 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; > + Further up demux.out still holds this handle. But we don't actually start_async when use_sideband is false so demux.out can't be used anywhere else. So it's good. Acked-by: me > ret = finish_command(&cmd); > if (!ret || (args->check_self_contained_and_connected && ret == 1)) > args->self_contained_and_connected = > diff --git a/send-pack.c b/send-pack.c > index 7d172ef..edbfd07 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); > -- > 1.8.1.2 > -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html