From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 7 Apr 2023 12:11:18 +0000 (-0400)
Subject: fix ASAN issues.  Fixes #4968
X-Git-Tag: release_3_2_3~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b0fec035d12fd09bf20b880b796f224b9f4a7a0;p=thirdparty%2Ffreeradius-server.git

fix ASAN issues.  Fixes #4968
---

diff --git a/src/main/map.c b/src/main/map.c
index ffee770fff..e59fcec6f0 100644
--- a/src/main/map.c
+++ b/src/main/map.c
@@ -1223,9 +1223,10 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t
 	 */
 	num = map->lhs->tmpl_num;
 	(void) fr_cursor_init(&dst_list, list);
-	if (num != NUM_ANY) {
+	if ((num != NUM_ANY) && (num > 0)) {
 		while ((dst = fr_cursor_next_by_da(&dst_list, map->lhs->tmpl_da, map->lhs->tmpl_tag))) {
-			if (num-- == 0) break;
+			if (num <= 0) break;
+			num--;
 		}
 	} else {
 		dst = fr_cursor_next_by_da(&dst_list, map->lhs->tmpl_da, map->lhs->tmpl_tag);