From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 17 Aug 2019 10:44:53 +0000 (+0300)
Subject: lib: Fix updating timeouts after time moves backwards
X-Git-Tag: 2.3.8~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1eebf46a8a9ac0e00b2bc0563602e03911c10aa5;p=thirdparty%2Fdovecot%2Fcore.git

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)
---

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);
 	}
 }