Merge branch 'jl/pack-transfer-avoid-double-close'

The codepath that send_pack() calls pack_objects() mistakenly
closed the same file descriptor twice, leading to potentially
closing a wrong file descriptor that was opened in the meantime.

* jl/pack-transfer-avoid-double-close:
  Clear fd after closing to avoid double-close error

2 files changed, 8 insertions, 0 deletions

diff --git a/fetch-pack.c b/fetch-pack.c
index a0e0350ae6..1042448fa0 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -747,6 +747,10 @@ static int get_pack(struct fetch_pack_args *args,
 		close(cmd.out);
 	}
 
+	if (!use_sideband)
+		/* Closed by start_command() */
+		xd[0] = -1;
+
 	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 b228d65613..fab62e3da0 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -302,8 +302,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);