From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 1 Jun 2021 23:52:30 +0000 (-0500)
Subject: Helps to terminate the right buffer
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecdfa64db61b6641148e66a15c0c019869a8bd08;p=thirdparty%2Ffreeradius-server.git

Helps to terminate the right buffer
---

diff --git a/src/lib/util/base16.c b/src/lib/util/base16.c
index 5f7505bcdc5..3628e7da057 100644
--- a/src/lib/util/base16.c
+++ b/src/lib/util/base16.c
@@ -124,7 +124,7 @@ ssize_t fr_base16_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in, char const alphab
 		fr_dbuff_advance(&our_in, 1);
 	}
 
-	fr_sbuff_terminate(out);	/* Ensure this is terminated, even on zero length input */
+	fr_sbuff_terminate(&our_out);	/* Ensure this is terminated, even on zero length input */
 	fr_dbuff_set(in, &our_in);
 	return fr_sbuff_set(out, &our_out);
 }
diff --git a/src/lib/util/base32.c b/src/lib/util/base32.c
index f5aa0e0628c..d095421ea0e 100644
--- a/src/lib/util/base32.c
+++ b/src/lib/util/base32.c
@@ -293,7 +293,7 @@ ssize_t fr_base32_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in,
 
 	fr_strerror_clear();
 
-	fr_sbuff_terminate(out);	/* Ensure this is terminated, even on zero length input */
+	fr_sbuff_terminate(&our_out);	/* Ensure this is terminated, even on zero length input */
 	fr_dbuff_set(in, &our_in);
 	return fr_sbuff_set(out, &our_out);
 }
diff --git a/src/lib/util/base64.c b/src/lib/util/base64.c
index 7cbc5faae05..b9c112ab8a1 100644
--- a/src/lib/util/base64.c
+++ b/src/lib/util/base64.c
@@ -379,7 +379,7 @@ ssize_t fr_base64_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in,
 
 	fr_strerror_clear();
 
-	fr_sbuff_terminate(out);	/* Ensure this is terminated, even on zero length input */
+	fr_sbuff_terminate(&our_out);	/* Ensure this is terminated, even on zero length input */
 	fr_dbuff_set(in, &our_in);
 	return fr_sbuff_set(out, &our_out);
 }