]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Correct assert on timer being disarmed
authorNick Porter <nick@portercomputing.co.uk>
Tue, 22 Jul 2025 13:29:04 +0000 (14:29 +0100)
committerNick Porter <nick@portercomputing.co.uk>
Tue, 22 Jul 2025 15:23:25 +0000 (16:23 +0100)
src/modules/rlm_tacacs/rlm_tacacs_tcp.c

index f7c3258c84ca21febd59659f923074b70479ba49..a6512ce0caea7663e0fa5ad2eb13bfe74e21908f 100644 (file)
@@ -1263,7 +1263,7 @@ static void request_complete(request_t *request, NDEBUG_UNUSED void *preq, void
        tcp_request_t           *req = talloc_get_type_abort(preq, tcp_request_t);
 #endif
 
-       fr_assert(!req->packet && !req->ev);    /* Dealt with by request_conn_release */
+       fr_assert(!req->packet && !fr_timer_armed(req->ev));    /* Dealt with by request_conn_release */
 
        r->treq = NULL;
 
@@ -1277,7 +1277,7 @@ static void request_free(UNUSED request_t *request, void *preq_to_free, UNUSED v
 {
        tcp_request_t           *req = talloc_get_type_abort(preq_to_free, tcp_request_t);
 
-       fr_assert(!req->packet && !req->ev);    /* Dealt with by request_conn_release */
+       fr_assert(!req->packet && !fr_timer_armed(req->ev));    /* Dealt with by request_conn_release */
 
        talloc_free(req);
 }