From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 12 Oct 2018 14:21:04 +0000 (-0400)
Subject: clean up the code a bit
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50d243abfa2bfffd0a6253bc7bd9ce1058f07cf2;p=thirdparty%2Ffreeradius-server.git

clean up the code a bit
---

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index a712352667f..3581cef9af9 100644
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -168,23 +168,25 @@ ssize_t fr_struct_to_network(uint8_t *out, size_t outlen,
 	}
 
 	while (outlen) {
-		fr_dict_attr_t const *child_da;
+		fr_dict_attr_t const *child;
 
 		/*
 		 *	The child attributes should be in order.  If
 		 *	they're not, we fill the struct with zeroes.
 		 */
-		child_da = vp->da;
-		if (child_da->attr != child_num) {
-			child_da = fr_dict_attr_child_by_num(parent, child_num);
+		child = vp->da;
+		if (child->attr != child_num) {
+			child = fr_dict_attr_child_by_num(parent, child_num);
 
-			if (!child_da) break;
+			if (!child) break;
 
-			if (child_da->flags.length < outlen) break;
+			if (child->flags.length > outlen) {
+				len = outlen;
+			} else {
+				len = child->flags.length;
+			}
 
-			len = child_da->flags.length;
 			memset(p, 0, len);
-
 			p += len;
 			outlen -= len;
 			child_num++;