From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 4 Jun 2020 20:45:24 +0000 (-0500)
Subject: This is why consistency is important...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ef104e0598bb9071927f403eff537e1dcf36910;p=thirdparty%2Ffreeradius-server.git

This is why consistency is important...
---

diff --git a/src/lib/util/talloc.c b/src/lib/util/talloc.c
index 87b9edb1fb5..18efa59cf74 100644
--- a/src/lib/util/talloc.c
+++ b/src/lib/util/talloc.c
@@ -364,11 +364,11 @@ char *talloc_typed_vasprintf(TALLOC_CTX *ctx, char const *fmt, va_list ap)
 char *talloc_bstrdup(TALLOC_CTX *ctx, char const *in)
 {
 	char	*p;
-	size_t	len = talloc_array_length(in);
+	size_t	inlen = talloc_array_length(in);
 
-	if (len == 0) len = 1;
+	if (inlen == 0) inlen = 1;
 
-	p = talloc_array(ctx, char, len);
+	p = talloc_array(ctx, char, inlen);
 	if (!p) return NULL;
 
 	/*
@@ -376,8 +376,8 @@ char *talloc_bstrdup(TALLOC_CTX *ctx, char const *in)
 	 *
 	 * But ubsan still flags this, grrr.
 	 */
-	if (inlen > 0) memcpy(p, in, len - 1);
-	p[len] = '\0';
+	if (inlen > 0) memcpy(p, in, inlen - 1);
+	p[inlen] = '\0';
 
 	return p;
 }