diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -175,13 +175,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -187,13 +187,6 @@ void setup_protocol(int f_out,int f_in)
if (protocol_version < 30) {
if (append_mode == 1)
append_mode = 2;
#define RSYNC_XAL_INITIAL 5
#define RSYNC_XAL_LIST_INITIAL 100
-@@ -242,7 +244,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;
/* For large datums, we store a flag and a checksum. */
name_offset = 1 + MAX_DIGEST_LEN;
sum_init(checksum_seed);
-@@ -310,7 +312,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;
if (memcmp(rxas1[j].datum + 1,
rxas2[j].datum + 1,
MAX_DIGEST_LEN) != 0)
-@@ -347,34 +349,43 @@ 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);
- write_varint(f, count);
+ write_varint30(f, count);
for (rxa = sxp->xattr->items; count--; rxa++) {
- #ifdef HAVE_LINUX_XATTRS
-- write_varint(f, rxa->name_len);
+ size_t name_len = rxa->name_len;
+ const char *name = rxa->name;
+@@ -368,8 +379,8 @@ int send_xattr(stat_x *sxp, int f)
+ name_len += UPRE_LEN;
+ }
+ #endif
+- write_varint(f, name_len);
- write_varint(f, rxa->datum_len);
-+ write_varint30(f, rxa->name_len);
++ write_varint30(f, name_len);
+ write_varint30(f, rxa->datum_len);
- write_buf(f, rxa->name, rxa->name_len);
- #else
- /* We strip the rsync prefix from disguised namespaces
- * and put everything else in the user namespace. */
- if (HAS_PREFIX(rxa->name, RSYNC_PREFIX)
- && rxa->name[RPRE_LEN] != '%') {
-- write_varint(f, rxa->name_len - RPRE_LEN);
-- write_varint(f, rxa->datum_len);
-+ write_varint30(f, rxa->name_len - RPRE_LEN);
-+ write_varint30(f, rxa->datum_len);
- write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN);
- } else {
-- write_varint(f, rxa->name_len + UPRE_LEN);
-- write_varint(f, rxa->datum_len);
-+ write_varint30(f, rxa->name_len + UPRE_LEN);
-+ write_varint30(f, rxa->datum_len);
+ #ifndef HAVE_LINUX_XATTRS
+ if (name_len > rxa->name_len) {
write_buf(f, USER_PREFIX, UPRE_LEN);
- write_buf(f, rxa->name, rxa->name_len);
+@@ -377,7 +388,7 @@ int send_xattr(stat_x *sxp, int f)
}
#endif
+ write_buf(f, name, name_len);
- if (rxa->datum_len > MAX_FULL_DATUM)
+ if (rxa->datum_len > MAX_FULL_DATUM && protocol_version >= 30)
write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
else
write_buf(f, rxa->datum, rxa->datum_len);
-@@ -424,7 +435,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;
same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
&& memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
MAX_DIGEST_LEN) == 0;
-@@ -467,6 +478,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;
lst += F_XATTR(file);
for (rxa = lst->items, cnt = lst->count; cnt--; rxa++) {
if (rxa->datum_len <= MAX_FULL_DATUM)
-@@ -540,6 +554,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;
if (F_XATTR(file) < 0) {
rprintf(FERROR, "recv_xattr_request: internal data error!\n");
exit_cleanup(RERR_STREAMIO);
-@@ -596,7 +613,22 @@ void receive_xattr(struct file_struct *file, int f)
- {
- static item_list temp_xattr = EMPTY_ITEM_LIST;
- int count, num;
+@@ -585,7 +602,22 @@ void receive_xattr(struct file_struct *file, int f)
+ #else
+ int need_sort = 1;
+ #endif
- int ndx = read_varint(f);
+ int ndx;
+
if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
rprintf(FERROR, "receive_xattr: xa index %d out of"
-@@ -609,7 +641,7 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -598,7 +630,7 @@ void receive_xattr(struct file_struct *file, int f)
return;
}
(void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
temp_xattr.count = 0;
}
-@@ -617,9 +649,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;
+ 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))