From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 14 Dec 2025 13:11:29 +0000 (-0500)
Subject: verify the destination pair, not just its children
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7b5c0ba1ee953d2503e94d1ce9c5f1b0e8bfaad;p=thirdparty%2Ffreeradius-server.git

verify the destination pair, not just its children

the change allows the children to be verified for their talloc
ctx, too
---

diff --git a/src/lib/util/edit.c b/src/lib/util/edit.c
index ee7d84ce903..8d5251f3449 100644
--- a/src/lib/util/edit.c
+++ b/src/lib/util/edit.c
@@ -1049,7 +1049,7 @@ static int list_union(fr_edit_list_t *el, fr_pair_t *dst, fr_pair_list_t *src, b
 	fr_pair_list_sort(&dst->children, fr_pair_cmp_by_parent_num);
 	fr_pair_list_sort(src, fr_pair_cmp_by_parent_num);
 
-	PAIR_LIST_VERIFY(&dst->children);
+	PAIR_VERIFY(dst);
 	PAIR_LIST_VERIFY(src);
 
 	a = fr_pair_list_head(&dst->children);
@@ -1174,7 +1174,7 @@ static int list_merge_lhs(fr_edit_list_t *el, fr_pair_t *dst, fr_pair_list_t *sr
 	fr_pair_list_sort(&dst->children, fr_pair_cmp_by_parent_num);
 	fr_pair_list_sort(src, fr_pair_cmp_by_parent_num);
 
-	PAIR_LIST_VERIFY(&dst->children);
+	PAIR_VERIFY(dst);
 	PAIR_LIST_VERIFY(src);
 
 	a = fr_pair_list_head(&dst->children);
@@ -1278,7 +1278,7 @@ static int list_merge_rhs(fr_edit_list_t *el, fr_pair_t *dst, fr_pair_list_t *sr
 	fr_pair_list_sort(&dst->children, fr_pair_cmp_by_parent_num);
 	fr_pair_list_sort(src, fr_pair_cmp_by_parent_num);
 
-	PAIR_LIST_VERIFY(&dst->children);
+	PAIR_VERIFY(dst);
 	PAIR_LIST_VERIFY(src);
 
 	a = fr_pair_list_head(&dst->children);