From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 13 Nov 2020 23:38:01 +0000 (-0600)
Subject: Fix edge case in fr_dict_attr_common_parent
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd4bea2020bb8640f8ec5d0ec8d28d7d73b2eb58;p=thirdparty%2Ffreeradius-server.git

Fix edge case in fr_dict_attr_common_parent
---

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index ff89025e1d9..68cd282db24 100644
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -1444,7 +1444,7 @@ fr_dict_attr_t const *fr_dict_attr_common_parent(fr_dict_attr_t const *a, fr_dic
 
 	if (!a || !b) return NULL;
 
-	if (is_ancestor && (b->depth <= a->depth)) return NULL;
+	if (is_ancestor && (b->depth <= a->depth)) return NULL;	/* fast_path */
 
 	/*
 	 *	Find a common depth to work back from
@@ -1452,9 +1452,11 @@ fr_dict_attr_t const *fr_dict_attr_common_parent(fr_dict_attr_t const *a, fr_dic
 	if (a->depth > b->depth) {
 		p_b = b;
 		for (p_a = a, i = a->depth - b->depth; p_a && (i > 0); p_a = p_a->parent, i--);
+		if (is_ancestor && (p_a != p_b)) return NULL;
 	} else if (a->depth < b->depth) {
 		p_a = a;
 		for (p_b = b, i = b->depth - a->depth; p_b && (i > 0); p_b = p_b->parent, i--);
+		if (is_ancestor && (p_a != p_b)) return NULL;
 	} else {
 		p_a = a;
 		p_b = b;