From: Jeremy Allison <jra@samba.org>
Date: Thu, 1 Mar 2012 20:35:27 +0000 (-0800)
Subject: Move to talloc from malloc.
X-Git-Tag: tdb-1.2.10~485
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=049375ec51ef404e61963e1f6ba10c116fde9767;p=thirdparty%2Fsamba.git

Move to talloc from malloc.
---

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 216edacf278..0c8a3409296 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -4185,7 +4185,9 @@ static NTSTATUS cli_set_ea(struct cli_state *cli, uint16_t setup_val,
 
 	if (ea_namelen == 0 && ea_len == 0) {
 		data_len = 4;
-		data = (uint8_t *)SMB_MALLOC(data_len);
+		data = talloc_array(talloc_tos(),
+				uint8_t,
+				data_len);
 		if (!data) {
 			return NT_STATUS_NO_MEMORY;
 		}
@@ -4193,7 +4195,9 @@ static NTSTATUS cli_set_ea(struct cli_state *cli, uint16_t setup_val,
 		SIVAL(p,0,data_len);
 	} else {
 		data_len = 4 + 4 + ea_namelen + 1 + ea_len;
-		data = (uint8_t *)SMB_MALLOC(data_len);
+		data = talloc_array(talloc_tos(),
+				uint8_t,
+				data_len);
 		if (!data) {
 			return NT_STATUS_NO_MEMORY;
 		}
@@ -4215,7 +4219,7 @@ static NTSTATUS cli_set_ea(struct cli_state *cli, uint16_t setup_val,
 			   NULL, 0, NULL, /* rsetup */
 			   NULL, 0, NULL, /* rparam */
 			   NULL, 0, NULL); /* rdata */
-	SAFE_FREE(data);
+	talloc_free(data);
 	return status;
 }