From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 27 Mar 2025 19:14:47 +0000 (-0600)
Subject: Do more talloc checks on timer chunks
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40909d4e5b3f0878c1dc1160635517bb4f4bbc99;p=thirdparty%2Ffreeradius-server.git

Do more talloc checks on timer chunks
---

diff --git a/src/lib/util/timer.c b/src/lib/util/timer.c
index d13ad7939ab..f7e2349a58d 100644
--- a/src/lib/util/timer.c
+++ b/src/lib/util/timer.c
@@ -402,7 +402,7 @@ int _fr_timer_at(NDEBUG_LOCATION_ARGS
 
 		talloc_set_destructor(ev, _timer_free);
 	} else {
-		ev = UNCONST(fr_timer_t *, *ev_p);
+		ev = talloc_get_type_abort(UNCONST(fr_timer_t *, *ev_p), fr_timer_t);
 
 		EVENT_DEBUG("%p - " NDEBUG_LOCATION_FMT "Re-armed timer %p", tl, NDEBUG_LOCATION_VALS ev);
 
@@ -701,7 +701,7 @@ static int timer_list_lst_run(fr_timer_list_t *tl, fr_time_t *when)
 	int		fired = 0;
 
 	while (fr_lst_num_elements(tl->lst) > 0) {
-		ev = fr_lst_peek(tl->lst);
+		ev = talloc_get_type_abort(fr_lst_peek(tl->lst), fr_timer_t);
 
 		/*
 		 *	See if it's time to do this one.
@@ -760,6 +760,8 @@ static int timer_list_ordered_run(fr_timer_list_t *tl, fr_time_t *when)
 	unsigned int	fired = 0;
 
 	while ((ev = timer_head(&tl->ordered))) {
+		(void)talloc_get_type_abort(ev, fr_timer_t);
+
 		/*
 		 *	See if it's time to do this one.
 		 */