From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 18 Mar 2020 19:51:27 +0000 (-0400)
Subject: no need to copy `fmt`, it's been const for a while
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30cd41ac5bcf88a3387e01698d66ee127900f6eb;p=thirdparty%2Ffreeradius-server.git

no need to copy `fmt`, it's been const for a while
---

diff --git a/src/lib/server/xlat_tokenize.c b/src/lib/server/xlat_tokenize.c
index 45b22ec47d5..9200364559b 100644
--- a/src/lib/server/xlat_tokenize.c
+++ b/src/lib/server/xlat_tokenize.c
@@ -893,20 +893,11 @@ ssize_t xlat_tokenize_ephemeral(TALLOC_CTX *ctx, xlat_exp_t **head, REQUEST *req
 			        char const *fmt, vp_tmpl_rules_t const *rules)
 {
 	ssize_t		slen;
-	char		*tokens;
 
 	*head = NULL;
 
-	/*
-	 *	Copy the original format string to a buffer so that
-	 *	the later functions can mangle it in-place, which is
-	 *	much faster.
-	 */
-	tokens = talloc_typed_strdup(ctx, fmt);
-	if (!tokens) return -1;
-
 	fr_strerror();	/* Clear error buffer */
-	slen = xlat_tokenize_literal(request, head, tokens, false, rules);
+	slen = xlat_tokenize_literal(request, head, fmt, false, rules);
 
 	/*
 	 *	Zero length expansion, return a zero length node.
@@ -923,7 +914,6 @@ ssize_t xlat_tokenize_ephemeral(TALLOC_CTX *ctx, xlat_exp_t **head, REQUEST *req
 	 *	"       ^ error was here"
 	 */
 	if (slen < 0) {
-		talloc_free(tokens);
 		return slen;
 	}
 
@@ -933,13 +923,6 @@ ssize_t xlat_tokenize_ephemeral(TALLOC_CTX *ctx, xlat_exp_t **head, REQUEST *req
 		xlat_tokenize_debug(request, *head);
 	}
 
-	/*
-	 *	All of the nodes point to offsets in the "tokens"
-	 *	string.  Let's ensure that free'ing head will free
-	 *	"tokens", too.
-	 */
-	(void) talloc_steal(*head, tokens);
-
 	/*
 	 *	Create ephemeral instance data for the xlat
 	 */