X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=blobdiff_plain;f=fetch-pack.c;h=acd55ba6e82a860eeb973d9d255c8d7efc13bddc;hp=ca2b101b8dac89acb3cfa0a980676f37824013f6;hb=a08a83db2bf27f015bec9a435f6d73e223c21c5e;hpb=dd4b732df73b06878b81fce050e7dcac4366a38e

diff --git a/fetch-pack.c b/fetch-pack.c
index ca2b101b8d..acd55ba6e8 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1496,6 +1496,13 @@ enum fetch_state {
 	FETCH_DONE,
 };
 
+static void do_check_stateless_delimiter(const struct fetch_pack_args *args,
+					 struct packet_reader *reader)
+{
+	check_stateless_delimiter(args->stateless_rpc, reader,
+				  _("git fetch-pack: expected response end packet"));
+}
+
 static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 				    int fd[2],
 				    const struct ref *orig_ref,
@@ -1582,6 +1589,10 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 			/* Process ACKs/NAKs */
 			switch (process_acks(negotiator, &reader, &common)) {
 			case READY:
+				/*
+				 * Don't check for response delimiter; get_pack() will
+				 * read the rest of this response.
+				 */
 				state = FETCH_GET_PACK;
 				break;
 			case COMMON_FOUND:
@@ -1589,6 +1600,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 				seen_ack = 1;
 				/* fallthrough */
 			case NO_COMMON_FOUND:
+				do_check_stateless_delimiter(args, &reader);
 				state = FETCH_SEND_REQUEST;
 				break;
 			}
@@ -1611,6 +1623,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 			if (get_pack(args, fd, pack_lockfiles,
 				     !packfile_uris.nr, sought, nr_sought))
 				die(_("git fetch-pack: fetch failed."));
+			do_check_stateless_delimiter(args, &reader);
 
 			state = FETCH_DONE;
 			break;