From bb6fbcf6e75201cebac30220366d4aff620b8765 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Wed, 7 Feb 2024 10:43:29 +0100 Subject: [PATCH] unix,win: reset the timer queue on stop (#4304) As there were instances where this didn't happen and could cause memory corruption issues. Refs: https://github.com/libuv/libuv/issues/4248 --- src/timer.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/timer.c b/src/timer.c index b57d6427..4525199d 100644 --- a/src/timer.c +++ b/src/timer.c @@ -94,20 +94,18 @@ int uv_timer_start(uv_timer_t* handle, return 0; } -static void timer_stop(uv_timer_t* handle) { - heap_remove(timer_heap(handle->loop), - (struct heap_node*) &handle->node.heap, - timer_less_than); - uv__handle_stop(handle); - uv__queue_init(&handle->node.queue); -} - int uv_timer_stop(uv_timer_t* handle) { - if (uv__is_active(handle)) - timer_stop(handle); - else + if (uv__is_active(handle)) { + heap_remove(timer_heap(handle->loop), + (struct heap_node*) &handle->node.heap, + timer_less_than); + uv__handle_stop(handle); + } else { uv__queue_remove(&handle->node.queue); + } + + uv__queue_init(&handle->node.queue); return 0; } @@ -181,7 +179,7 @@ void uv__run_timers(uv_loop_t* loop) { if (handle->timeout > loop->time) break; - timer_stop(handle); + uv_timer_stop(handle); uv__queue_insert_tail(&ready_queue, &handle->node.queue); }