From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 7 Oct 2021 02:43:26 +0000 (-0500)
Subject: Don't verify data.enumv for structural types
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4152f64513bb142980c3ac652d540dacadc0cf98;p=thirdparty%2Ffreeradius-server.git

Don't verify data.enumv for structural types
---

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 7f075e199d..65fce525d0 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -261,6 +261,8 @@ fr_pair_t *fr_pair_afrom_da(TALLOC_CTX *ctx, fr_dict_attr_t const *da)
 		break;
 	}
 
+	VP_VERIFY(vp);
+
 	return vp;
 }
 
@@ -2325,7 +2327,7 @@ void fr_pair_verify(char const *file, int line, fr_pair_t const *vp)
 	}
 
 	fr_dict_attr_verify(file, line, vp->da);
-	if (vp->data.enumv) fr_dict_attr_verify(file, line, vp->data.enumv);
+
 	/*
 	 *	Each pair should be in one state, either inserted
 	 *	into a list or not...
@@ -2425,6 +2427,16 @@ void fr_pair_verify(char const *file, int line, fr_pair_t const *vp)
 		return;
 	}
 
+	/*
+	 *	Only perform this check when we're sure
+	 *	that this attribute isn't structural.
+	 *
+	 *	If it's a structural type then the
+	 *	space used by the fr_value_box_t gets
+	 *	used by the pair list.
+	 */
+	if (vp->data.enumv) fr_dict_attr_verify(file, line, vp->data.enumv);
+
 	if (vp->vp_ptr) switch (vp->vp_type) {
 	case FR_TYPE_OCTETS:
 	{