From: Wayne Davison <wayned@samba.org>
Date: Fri, 16 Dec 2011 17:03:25 +0000 (-0800)
Subject: Avoid double-free of xattr/acl data in real_sx.
X-Git-Tag: v3.1.0pre1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3b62ff4cf1175a52c851d196b94aa378976621d;p=thirdparty%2Frsync.git

Avoid double-free of xattr/acl data in real_sx.
Fixes bug 8665.
---

diff --git a/generator.c b/generator.c
index df690da6..e05d889c 100644
--- a/generator.c
+++ b/generator.c
@@ -1349,8 +1349,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				dry_missing_dir = file;
 			file->flags |= FLAG_MISSING_DIR;
 		}
+		init_stat_x(&real_sx);
+		real_sx.st = sx.st;
 		real_ret = statret;
-		real_sx = sx;
 		if (file->flags & FLAG_DIR_CREATED)
 			statret = -1;
 		if (!preserve_perms) { /* See comment in non-dir code below. */
@@ -1653,8 +1654,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 	}
 
+	init_stat_x(&real_sx);
+	real_sx.st = sx.st; /* Don't copy xattr/acl pointers, as they would free wrong. */
 	real_ret = statret;
-	real_sx = sx;
 
 	if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
 	    && link_stat(partialptr, &partial_st, 0) == 0