From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 22 Apr 2025 18:35:48 +0000 (-0500)
Subject: Disarm the curl I/O timer instead of deleting it
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79d4e8528c35033491539617c72a78df1c04cf02;p=thirdparty%2Ffreeradius-server.git

Disarm the curl I/O timer instead of deleting it
---

diff --git a/src/lib/curl/io.c b/src/lib/curl/io.c
index a775c09e85b..8c706381576 100644
--- a/src/lib/curl/io.c
+++ b/src/lib/curl/io.c
@@ -277,10 +277,7 @@ static int _fr_curl_io_timer_modify(CURLM *mandle, long timeout_ms, void *ctx)
 	fr_curl_handle_t	*mhandle = talloc_get_type_abort(ctx, fr_curl_handle_t);
 
 	if (timeout_ms < 0) {
-		if (fr_timer_delete(&mhandle->ev) < 0) {
-			PERROR("Failed deleting multi-handle timer");
-			return -1;
-		}
+		if (!fr_cond_assert_msg(fr_timer_disarm(mhandle->ev) == 0, "Failed disarming curl timer")) return -1;
 		DEBUG3("multi-handle %p - Timer removed", mandle);
 		return 0;
 	}