Clear fd after closing to avoid double-close error
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@opera.com> Acked-by: Jeff King <peff@peff.net> Acked-by: Duy Nguyen <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lindstrom committed
Oct 22, 2013 at 15:36 UTC
37cb1dd671e5e22cee363f98637a5a58f16be054
2 files changed
+8
fetch-pack.c
+4
@@ -776,6 +776,10 @@ static int get_pack(struct fetch_pack_args *args,
776
close(cmd.out);
777
}
778
779
+ if (!use_sideband)
780
+ /* Closed by start_command() */
781
+ xd[0] = -1;
782
+
783
ret = finish_command(&cmd);
784
if (!ret || (args->check_self_contained_and_connected && ret == 1))
785
args->self_contained_and_connected =
send-pack.c
+4
@@ -300,8 +300,12 @@ int send_pack(struct send_pack_args *args,
300
shutdown(fd[0], SHUT_WR);
301
if (use_sideband)
302
finish_async(&demux);
303
+ fd[1] = -1;
304
return -1;
305
}
306
+ if (!args->stateless_rpc)
307
+ /* Closed by pack_objects() via start_command() */
308
+ fd[1] = -1;
309
}
310
if (args->stateless_rpc && cmds_sent)
311
packet_flush(out);