X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f57b2e6150af146c87e7d51a45e98118c60a510b..d508258ad81346389881c6b672e705103b3c762e:/flist.c

diff --git a/flist.c b/flist.c
index b1a35381..7c39e538 100644
--- a/flist.c
+++ b/flist.c
@@ -542,6 +542,9 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 		return;
 	}
 
+	if (!flist || !flist->count)	/* Ignore lastdir when invalid. */
+		lastdir_len = -1;
+
 	if (flags & XMIT_SAME_NAME)
 		l1 = read_byte(f);
 
@@ -745,7 +748,7 @@ struct file_struct *make_file(char *fname,
 	char *basename, *dirname, *bp;
 	unsigned short flags = 0;
 
-	if (!flist)	/* lastdir isn't valid if flist is NULL */
+	if (!flist || !flist->count)	/* Ignore lastdir when invalid. */
 		lastdir_len = -1;
 
 	if (strlcpy(thisname, fname, sizeof thisname)