X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/bc3fcf1d39ca698386e09f1abc1a54178102e558..e66d6d511b675d31a3c55b51fd28d5d2558d094a:/xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index 1fd2934..10fce12 100644
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -46,7 +46,7 @@ diff --git a/xattrs.c b/xattrs.c
  
  #define RSYNC_XAL_INITIAL 5
  #define RSYNC_XAL_LIST_INITIAL 100
-@@ -245,7 +247,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -246,7 +248,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
  		if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
  			return -1;
  
@@ -55,7 +55,7 @@ diff --git a/xattrs.c b/xattrs.c
  			/* For large datums, we store a flag and a checksum. */
  			name_offset = 1 + MAX_DIGEST_LEN;
  			sum_init(checksum_seed);
-@@ -305,7 +307,7 @@ static int find_matching_xattr(item_list *xalp)
+@@ -306,7 +308,7 @@ static int find_matching_xattr(item_list *xalp)
  			 || rxas1[j].datum_len != rxas2[j].datum_len
  			 || strcmp(rxas1[j].name, rxas2[j].name))
  				break;
@@ -64,7 +64,7 @@ diff --git a/xattrs.c b/xattrs.c
  				if (memcmp(rxas1[j].datum + 1,
  					   rxas2[j].datum + 1,
  					   MAX_DIGEST_LEN) != 0)
-@@ -342,13 +344,22 @@ int send_xattr(stat_x *sxp, int f)
+@@ -343,13 +345,22 @@ int send_xattr(stat_x *sxp, int f)
  {
  	int ndx = find_matching_xattr(sxp->xattr);
  
@@ -90,7 +90,7 @@ diff --git a/xattrs.c b/xattrs.c
  		for (rxa = sxp->xattr->items; count--; rxa++) {
  			size_t name_len = rxa->name_len;
  			const char *name = rxa->name;
-@@ -367,8 +378,8 @@ int send_xattr(stat_x *sxp, int f)
+@@ -368,8 +379,8 @@ int send_xattr(stat_x *sxp, int f)
  				name_len += UPRE_LEN;
  			}
  #endif
@@ -101,7 +101,7 @@ diff --git a/xattrs.c b/xattrs.c
  #ifndef HAVE_LINUX_XATTRS
  			if (name_len > rxa->name_len) {
  				write_buf(f, USER_PREFIX, UPRE_LEN);
-@@ -376,7 +387,7 @@ int send_xattr(stat_x *sxp, int f)
+@@ -377,7 +388,7 @@ int send_xattr(stat_x *sxp, int f)
  			}
  #endif
  			write_buf(f, name, name_len);
@@ -110,7 +110,7 @@ diff --git a/xattrs.c b/xattrs.c
  				write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
  			else
  				write_buf(f, rxa->datum, rxa->datum_len);
-@@ -426,7 +437,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
+@@ -427,7 +438,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
  		cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
  		if (cmp > 0)
  			same = 0;
@@ -119,7 +119,7 @@ diff --git a/xattrs.c b/xattrs.c
  			same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
  			    && memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
  				      MAX_DIGEST_LEN) == 0;
-@@ -469,6 +480,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
+@@ -470,6 +481,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
  	int cnt, prior_req = 0;
  	rsync_xa *rxa;
  
@@ -129,7 +129,7 @@ diff --git a/xattrs.c b/xattrs.c
  	lst += F_XATTR(file);
  	for (rxa = lst->items, cnt = lst->count; cnt--; rxa++) {
  		if (rxa->datum_len <= MAX_FULL_DATUM)
-@@ -523,6 +537,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
+@@ -524,6 +538,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
  	rsync_xa *rxa;
  	int rel_pos, cnt, num, got_xattr_data = 0;
  
@@ -139,7 +139,7 @@ diff --git a/xattrs.c b/xattrs.c
  	if (F_XATTR(file) < 0) {
  		rprintf(FERROR, "recv_xattr_request: internal data error!\n");
  		exit_cleanup(RERR_STREAMIO);
-@@ -584,7 +601,22 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -585,7 +602,22 @@ void receive_xattr(struct file_struct *file, int f)
  #else
  	int need_sort = 1;
  #endif
@@ -163,7 +163,7 @@ diff --git a/xattrs.c b/xattrs.c
  
  	if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
  		rprintf(FERROR, "receive_xattr: xa index %d out of"
-@@ -597,7 +629,7 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -598,7 +630,7 @@ void receive_xattr(struct file_struct *file, int f)
  		return;
  	}
  	
@@ -172,7 +172,7 @@ diff --git a/xattrs.c b/xattrs.c
  		(void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
  		temp_xattr.count = 0;
  	}
-@@ -605,9 +637,10 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -606,9 +638,10 @@ void receive_xattr(struct file_struct *file, int f)
  	for (num = 1; num <= count; num++) {
  		char *ptr, *name;
  		rsync_xa *rxa;
@@ -184,5 +184,5 @@ diff --git a/xattrs.c b/xattrs.c
 +		size_t dget_len = datum_len > MAX_FULL_DATUM && protocol_version >= 30
 +				? 1 + MAX_DIGEST_LEN : datum_len;
  		size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0;
- 		if (dget_len + extra_len < dget_len)
- 			out_of_memory("receive_xattr"); /* overflow */
+ 		if ((dget_len + extra_len < dget_len)
+ 		 || (dget_len + extra_len + name_len < dget_len))