From e7eb0d39a1a8cf8fc26c008ca0caa4c5b8f6694c Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 17 Aug 2019 13:44:53 +0300 Subject: [PATCH] lib: Fix updating timeouts after time moves backwards Broken by b258137d0e0618ae792e3606071a1715d26f107b Fixes: Panic: file ioloop.c: line 479 (timeout_get_wait_time): assertion failed: (ret > 0 && tv_r->tv_sec >= 0 && tv_r->tv_usec >= 0) --- src/lib/ioloop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/ioloop.c b/src/lib/ioloop.c index 20016eac1a..64fdb54a29 100644 --- a/src/lib/ioloop.c +++ b/src/lib/ioloop.c @@ -592,7 +592,10 @@ static void io_loop_timeouts_update(struct ioloop *ioloop, long long diff_usecs) for (i = 0; i < count; i++) { struct timeout *to = (struct timeout *)items[i]; - timeval_add_usecs(&to->next_run, diff_usecs); + if (diff_usecs > 0) + timeval_add_usecs(&to->next_run, diff_usecs); + else + timeval_sub_usecs(&to->next_run, -diff_usecs); } } -- 2.47.3