X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3e7934a5fb06dac717722c4d680d0c063dbf8d5f..8e6cf5d1891caeed1b1e6c446b8723cd33969b06:/receiver.c

diff --git a/receiver.c b/receiver.c
index 1779d175..fd75e8e9 100644
--- a/receiver.c
+++ b/receiver.c
@@ -426,6 +426,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 		}
 
 		if (i < 0 || i >= flist->count) {
+			/* Handle the new keep-alive (no-op) packet. */
+			if (i == flist->count && protocol_version >= 29
+	 		    && read_shortint(f_in) == ITEM_IS_NEW)
+				continue;
 			rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
 				i, flist->count);
 			exit_cleanup(RERR_PROTOCOL);