util_str: Don't return memory from talloc_tos(), use mem_ctx instead.

(This used to be commit ab0ee6e9a6a9eee317228f0c2bde254ad9a59b85)

1 files changed, 13 insertions, 10 deletions

diff --git a/source3/lib/afs.c b/source3/lib/afs.c
index a7d6f6c9f7..b3d590bf24 100644
--- a/source3/lib/afs.c
+++ b/source3/lib/afs.c
@@ -42,20 +42,23 @@ static char *afs_encode_token(const char *cell, const DATA_BLOB ticket,
 			      const struct ClearToken *ct)
 {
 	char *base64_ticket;
-	char *result;
+	char *result = NULL;
 
 	DATA_BLOB key = data_blob(ct->HandShakeKey, 8);
 	char *base64_key;
+	TALLOC_CTX *mem_ctx;
+
+	mem_ctx = talloc_init("afs_encode_token");
+	if (mem_ctx == NULL)
+		goto done;
 
-	base64_ticket = base64_encode_data_blob(ticket);
+	base64_ticket = base64_encode_data_blob(mem_ctx, ticket);
 	if (base64_ticket == NULL)
-		return NULL;
+		goto done;
 
-	base64_key = base64_encode_data_blob(key);
-	if (base64_key == NULL) {
-		TALLOC_FREE(base64_ticket);
-		return NULL;
-	}
+	base64_key = base64_encode_data_blob(mem_ctx, key);
+	if (base64_key == NULL)
+		goto done;
 
 	asprintf(&result, "%s\n%u\n%s\n%u\n%u\n%u\n%s\n", cell,
 		 ct->AuthHandle, base64_key, ct->ViceId, ct->BeginTimestamp,
@@ -63,8 +66,8 @@ static char *afs_encode_token(const char *cell, const DATA_BLOB ticket,
 
 	DEBUG(10, ("Got ticket string:\n%s\n", result));
 
-	TALLOC_FREE(base64_ticket);
-	TALLOC_FREE(base64_key);
+done:
+	TALLOC_FREE(mem_ctx);
 
 	return result;
 }