X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1923b1fce4db5e19c56ac461962b84c560a617b4..306ffb8c718faf0ff09c432301217482ce1e26c7:/flist.c

diff --git a/flist.c b/flist.c
index c4459b11..245a7ef9 100644
--- a/flist.c
+++ b/flist.c
@@ -441,19 +441,19 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	if (l2 > 255)
 		flags |= XMIT_LONG_NAME;
 
-	/* We must make sure we don't send a zero flags byte or
+	/* We must make sure we don't send a zero flag-byte or
 	 * the other end will terminate the flist transfer. */
-	if (flags == 0 && !S_ISDIR(mode))
+	if (!(flags & 0xFF) && !S_ISDIR(mode))
 		flags |= XMIT_TOP_DIR; /* NOTE: no meaning for non-dir */
 	if (protocol_version >= 28) {
-		if ((flags & 0xFF00) || flags == 0) {
+		if ((flags & 0xFF00) || !(flags & 0xFF)) {
 			flags |= XMIT_EXTENDED_FLAGS;
 			write_byte(f, flags);
 			write_byte(f, flags >> 8);
 		} else
 			write_byte(f, flags);
 	} else {
-		if (flags == 0)
+		if (!(flags & 0xFF))
 			flags |= XMIT_LONG_NAME;
 		write_byte(f, flags);
 	}
@@ -490,8 +490,9 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 #if SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(mode)) {
-		write_int(f, strlen(file->u.link));
-		write_buf(f, file->u.link, strlen(file->u.link));
+		int len = strlen(file->u.link);
+		write_int(f, len);
+		write_buf(f, file->u.link, len);
 	}
 #endif
 
@@ -643,14 +644,14 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 	}
 
 	if (preserve_links && S_ISLNK(mode)) {
-		int l = read_int(f);
-		if (l < 0) {
-			rprintf(FERROR, "overflow: l=%d\n", l);
+		int len = read_int(f);
+		if (len < 0 || len >= MAXPATHLEN) {
+			rprintf(FERROR, "overflow: len=%d\n", len);
 			overflow("receive_file_entry");
 		}
-		if (!(file->u.link = new_array(char, l + 1)))
+		if (!(file->u.link = new_array(char, len + 1)))
 			out_of_memory("receive_file_entry 2");
-		read_sbuf(f, file->u.link, l);
+		read_sbuf(f, file->u.link, len);
 		if (sanitize_paths)
 			sanitize_path(file->u.link, file->dirname);
 	}
@@ -725,7 +726,7 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 	char sum[SUM_LENGTH];
 	char *p;
 	char thisname[MAXPATHLEN];
-	char linkbuf[MAXPATHLEN];
+	char linkname[MAXPATHLEN];
 	unsigned short flags = 0;
 
 	if (strlcpy(thisname, fname, sizeof thisname)
@@ -739,7 +740,7 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 
 	memset(sum, 0, SUM_LENGTH);
 
-	if (readlink_stat(thisname, &st, linkbuf) != 0) {
+	if (readlink_stat(thisname, &st, linkname) != 0) {
 		int save_errno = errno;
 		if (errno == ENOENT && exclude_level != NO_EXCLUDES) {
 			/* either symlink pointing nowhere or file that
@@ -829,7 +830,7 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 
 #if SUPPORT_LINKS
 	if (S_ISLNK(st.st_mode))
-		file->u.link = STRDUP(ap, linkbuf);
+		file->u.link = STRDUP(ap, linkname);
 #endif
 
 	if (always_checksum && S_ISREG(st.st_mode)) {