From: Nick Porter <nick@portercomputing.co.uk>
Date: Sat, 9 Jan 2021 15:52:50 +0000 (+0000)
Subject: Handle child options being in a fr_pair_list_t in dhcpv6/encode.c
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f501b2ebaa2b7801e8e897f1f68085b9a8c4bd8f;p=thirdparty%2Ffreeradius-server.git

Handle child options being in a fr_pair_list_t in dhcpv6/encode.c
---

diff --git a/src/protocols/dhcpv6/encode.c b/src/protocols/dhcpv6/encode.c
index 18712f9b899..371a2b7437f 100644
--- a/src/protocols/dhcpv6/encode.c
+++ b/src/protocols/dhcpv6/encode.c
@@ -288,18 +288,15 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
 
 	case FR_TYPE_GROUP:
 	{
-		fr_pair_list_t child;
 		fr_dcursor_t child_cursor;
 
 		/*
 		 *	Encode the child options.
 		 */
-		child = vp->vp_group;
-		if (child) {
+		if (!fr_pair_list_empty(&vp->vp_group)) {
 			(void) fr_dcursor_init(&child_cursor, &vp->vp_group);
 
 			while (fr_dcursor_current(&child_cursor) != NULL) {
-				child = fr_dcursor_current(&child_cursor);
 				slen = fr_dhcpv6_encode_option(&work_dbuff, &child_cursor, encoder_ctx);
 				if (slen == PAIR_ENCODE_SKIPPED) continue;