Skip to content

Commit 37cb1dd

Browse files
opera-jlgitster
authored andcommitted
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 <[email protected]> Acked-by: Jeff King <[email protected]> Acked-by: Duy Nguyen <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5f737ac commit 37cb1dd

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

fetch-pack.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,10 @@ static int get_pack(struct fetch_pack_args *args,
776776
close(cmd.out);
777777
}
778778

779+
if (!use_sideband)
780+
/* Closed by start_command() */
781+
xd[0] = -1;
782+
779783
ret = finish_command(&cmd);
780784
if (!ret || (args->check_self_contained_and_connected && ret == 1))
781785
args->self_contained_and_connected =

send-pack.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,12 @@ int send_pack(struct send_pack_args *args,
300300
shutdown(fd[0], SHUT_WR);
301301
if (use_sideband)
302302
finish_async(&demux);
303+
fd[1] = -1;
303304
return -1;
304305
}
306+
if (!args->stateless_rpc)
307+
/* Closed by pack_objects() via start_command() */
308+
fd[1] = -1;
305309
}
306310
if (args->stateless_rpc && cmds_sent)
307311
packet_flush(out);

0 commit comments

Comments
 (0)