mirror of
https://github.com/neovim/neovim.git
synced 2025-09-24 20:18:32 +00:00
timer: make sure to free callback after the last timer due callback
fixes #6974 Before this change, the partial could be freed before the last due callback got invoked, which caused a use-after-free when the due callback called the partial.
This commit is contained in:
@@ -17039,7 +17039,8 @@ static void timer_stop(timer_T *timer)
|
|||||||
time_watcher_close(&timer->tw, timer_close_cb);
|
time_watcher_close(&timer->tw, timer_close_cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
// invoked on next event loop tick, so queue is empty
|
// This will be run on the main loop after the last timer_due_cb, so at this
|
||||||
|
// point it is safe to free the callback.
|
||||||
static void timer_close_cb(TimeWatcher *tw, void *data)
|
static void timer_close_cb(TimeWatcher *tw, void *data)
|
||||||
{
|
{
|
||||||
timer_T *timer = (timer_T *)data;
|
timer_T *timer = (timer_T *)data;
|
||||||
|
@@ -61,10 +61,17 @@ static void time_watcher_cb(uv_timer_t *handle)
|
|||||||
CREATE_EVENT(watcher->events, time_event, 1, watcher);
|
CREATE_EVENT(watcher->events, time_event, 1, watcher);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void close_event(void **argv)
|
||||||
|
{
|
||||||
|
TimeWatcher *watcher = argv[0];
|
||||||
|
watcher->close_cb(watcher, watcher->data);
|
||||||
|
}
|
||||||
|
|
||||||
static void close_cb(uv_handle_t *handle)
|
static void close_cb(uv_handle_t *handle)
|
||||||
|
FUNC_ATTR_NONNULL_ALL
|
||||||
{
|
{
|
||||||
TimeWatcher *watcher = handle->data;
|
TimeWatcher *watcher = handle->data;
|
||||||
if (watcher->close_cb) {
|
if (watcher->close_cb) {
|
||||||
watcher->close_cb(watcher, watcher->data);
|
CREATE_EVENT(watcher->events, close_event, 1, watcher);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user