From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 26 Mar 2026 02:31:22 +0000 (+1300)
Subject: be more aggressive about freeing memory in cursors
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9705ec548dcaca048809b1abda2a246eaacc891e;p=thirdparty%2Ffreeradius-server.git

be more aggressive about freeing memory in cursors
---

diff --git a/src/lib/server/tmpl_dcursor.c b/src/lib/server/tmpl_dcursor.c
index 5655dfee90f..ed34dcf30f8 100644
--- a/src/lib/server/tmpl_dcursor.c
+++ b/src/lib/server/tmpl_dcursor.c
@@ -422,6 +422,7 @@ fr_pair_t *tmpl_dcursor_init_relative(int *err, TALLOC_CTX *ctx, tmpl_dcursor_ct
 		return NULL;
 	}
 
+	if (err) *err = 0;
 	return vp;
 }
 
@@ -529,15 +530,15 @@ fr_pair_t *tmpl_dcursor_value_box_init(int *err, TALLOC_CTX *ctx, fr_value_box_t
 	 */
 	vp = tmpl_dcursor_init(err, cc, cc, cursor, request, vpt);
 	if (!vp) {
-		if (!err) return NULL;
+		talloc_free(cc);
 
-		if (*err == -1) {
+		if (err && (*err == -1)) {
 			RWDEBUG("Cursor %s returned no attributes", vpt->name);
 			goto set_cursor;
-		} else {
-			RPEDEBUG("Failed initializing cursor");
 		}
 
+		RPEDEBUG("Failed initializing cursor");
+		talloc_free(cursor);
 		return NULL;
 	}
 
@@ -722,6 +723,7 @@ int tmpl_extents_find(TALLOC_CTX *ctx,
 		break;
 	}
 
+	tmpl_dcursor_clear(&cc);
 	return 0;
 }