X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/09ca0d15d31d93a5964a1db4c387879f31c22831..46cd1ef6bc79f5779766d5829681cb2b0a66aa80:/flist.c

diff --git a/flist.c b/flist.c
index 84420c0b..0fc7851a 100644
--- a/flist.c
+++ b/flist.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2008 Wayne Davison
+ * Copyright (C) 2002-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1385,6 +1385,14 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 		if (preserve_links && S_ISLNK(file->mode)) {
 			symlink_name = F_SYMLINK(file);
 			symlink_len = strlen(symlink_name);
+			if (symlink_len == 0) {
+				io_error |= IOERR_GENERAL;
+				f_name(file, fbuf);
+				rprintf(FERROR_XFER,
+				    "skipping symlink with 0-length value: %s\n",
+				    full_fname(fbuf));
+				return NULL;
+			}
 		} else {
 			symlink_name = NULL;
 			symlink_len = 0;
@@ -1915,7 +1923,7 @@ void send_extra_file_list(int f, int at_least)
 			write_byte(f, 0);
 		else {
 			write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST);
-			write_int(f, io_error);
+			write_varint(f, io_error);
 		}
 
 		if (need_unsorted_flist) {
@@ -2218,7 +2226,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		write_byte(f, 0);
 	else {
 		write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST);
-		write_int(f, io_error);
+		write_varint(f, io_error);
 	}
 
 #ifdef SUPPORT_HARD_LINKS
@@ -2254,6 +2262,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	if (numeric_ids <= 0 && !inc_recurse)
 		send_id_list(f);
 
+	set_msg_fd_in(-1);
+
 	/* send the io_error flag */
 	if (protocol_version < 30)
 		write_int(f, ignore_errors ? 0 : io_error);
@@ -2341,7 +2351,7 @@ struct file_list *recv_file_list(int f)
 				rprintf(FERROR, "Invalid flist flag: %x\n", flags);
 				exit_cleanup(RERR_PROTOCOL);
 			}
-			err = read_int(f);
+			err = read_varint(f);
 			if (!ignore_errors)
 				io_error |= err;
 			break;