From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 3 Nov 2021 23:33:20 +0000 (-0400)
Subject: Fix assert
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a452138a083244f52f21eb469069d536ef982ef;p=thirdparty%2Ffreeradius-server.git

Fix assert
---

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index f8e8e3c7508..60f21b541ca 100644
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -1802,11 +1802,13 @@ int map_to_request(request_t *request, map_t const *map, radius_map_getvalue_t f
 			extent = fr_dlist_head(&leaf);
 			fr_pair_append(extent->list, fr_pair_copy(extent->list_ctx, src_vp));
 		}
+
+		fr_assert(fr_dlist_num_elements(&interior) == 0);
+		fr_dlist_talloc_free(&leaf);
+
 	op_set_done:
 		/* Free any we didn't insert */
 		fr_pair_list_free(&src_list);
-		fr_assert(fr_dlist_num_elements(&interior) == 0);
-		fr_dlist_talloc_free(&leaf);
 	}
 		break;
 
diff --git a/src/tests/keywords/map-xlat-nested-overwrite b/src/tests/keywords/map-xlat-nested-overwrite
index 46e602dea7c..505ea2474cb 100644
--- a/src/tests/keywords/map-xlat-nested-overwrite
+++ b/src/tests/keywords/map-xlat-nested-overwrite
@@ -4,7 +4,7 @@
 #  Test the map xlat
 #
 update {
-	&Tmp-String-0 := "request.Tmp-Group-0.Tmp-String-1 := 'testing123'"
+	&Tmp-String-0 := "request.Tmp-Group-0.Tmp-String-0 := 'testing123'"
 }
 
 if ("%{map:%{Tmp-String-0}}" != 1) {
@@ -15,4 +15,16 @@ if ("%{map:%{Tmp-String-0}}" != 1) {
 	test_fail
 }
 
+if ("%{map:request.Tmp-Group-0.Tmp-String-1 := 'testing000'}" != 1) {
+	test_fail
+}
+
+if (!&Tmp-Group-0[0].Tmp-String-0 || (&Tmp-Group-0[0].Tmp-String-0 != 'testing123')) {
+	test_fail
+}
+
+if (!&Tmp-Group-0[0].Tmp-String-1 || (&Tmp-Group-0[0].Tmp-String-1 != 'testing000')) {
+	test_fail
+}
+
 success