Re: [PATCH v2] Clear fd after closing to avoid double-close error
- From
Jeff King <peff@peff.net>
- Date
- Oct 22, 2013, 15:29 UTC
- Message-ID
- <20131022152948.GA21940@sigill.intra.peff.net>
- In-Reply-To
- <1382448962-31782-1-git-send-email-jl@opera.com>
On Tue, Oct 22, 2013 at 03:36:02PM +0200, Jens Lindström wrote:
Show 9 quoted lines
> 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().
Thanks, this looks like the right thing to do.
You had mentioned earlier in the thread the possibility of just dropping the close() in git_transport_push. I agree that it is not worth going that route, as it serves as a safety check to avoid leaking in early returns (and indeed, in both the fetch and push cases, we can return early without spawning a subprocess when the receiver already has all of the necessary objects).
> Signed-off-by: Jens Lindström <jl@opera.com>
Acked-by: Jeff King <peff@peff.net>
-Peff