From aedc189672ca293931b114fd8382ebea9ad0dbbd Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 16 Nov 2026 15:08:43 +0100 Subject: [PATCH] Reset watcher descriptor on failed cron and signal init When uev_cron_init() or uev_signal_init() fails to add the watcher to the event loop, the watcher is left with a descriptor that is closed. A later set or start on it then operates on that descriptor, which by then may belong to something else. Reset it to -1, as the timer and event watchers do. Signed-off-by: Joachim Wiberg --- src/cron.c | 6 ++++++ src/signal.c | 1 + test/error.c | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/src/cron.c b/src/cron.c index 6616fcd..8cf5012 100644 --- a/src/cron.c +++ b/src/cron.c @@ -68,6 +68,11 @@ int uev_cron_init(uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, time_t when { int fd; + if (!w || !ctx) { + errno = EINVAL; + return -1; + } + if (when < 0 || interval < 0) { errno = ERANGE; return -1; @@ -84,6 +89,7 @@ int uev_cron_init(uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, time_t when _uev_watcher_stop(w); exit: close(fd); + w->fd = -1; return -1; } diff --git a/src/signal.c b/src/signal.c index ca40015..5d6f8b6 100644 --- a/src/signal.c +++ b/src/signal.c @@ -72,6 +72,7 @@ int uev_signal_init(uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int signo _uev_watcher_stop(w); exit: close(fd); + w->fd = -1; return -1; } diff --git a/test/error.c b/test/error.c index 1aae319..26ebc91 100644 --- a/test/error.c +++ b/test/error.c @@ -1,5 +1,6 @@ /* Verifies cleanup on failure to set up a context or watcher */ #include "check.h" +#include #include /* A failed uev_event_init() must not leak its eventfd */ @@ -41,6 +42,22 @@ static void ctx_init(void) fail_unless(ctx.fd == -1); } +/* A failed init must not leave a closed descriptor in the watcher */ +static void watcher_init(void) +{ + uev_ctx_t ctx; + uev_t w; + + fail_unless(uev_init(&ctx) == 0); + fail_unless(close(ctx.fd) == 0); + + fail_unless(uev_cron_init(&ctx, &w, NULL, NULL, time(NULL) + 3600, 0) != 0); + fail_unless(w.fd == -1); + + fail_unless(uev_signal_init(&ctx, &w, NULL, NULL, SIGUSR1) != 0); + fail_unless(w.fd == -1); +} + /* Invalid arguments must not crash */ static void null_init(void) { @@ -48,12 +65,14 @@ static void null_init(void) fail_unless(uev_init(&ctx) == 0); fail_unless(uev_timer_init(&ctx, NULL, NULL, NULL, 100, 0) != 0); + fail_unless(uev_cron_init(&ctx, NULL, NULL, NULL, time(NULL) + 3600, 0) != 0); fail_unless(uev_exit(&ctx) == 0); } int main(void) { event_init(); + watcher_init(); null_init(); ctx_init();