From: Pavel Charvat <pchar@ucw.cz>
Date: Wed, 16 Jun 2010 18:03:35 +0000 (+0200)
Subject: mainloop: Fixed possible infinite timeouts.
X-Git-Tag: holmes-import~6
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=f2b0e71521b3d8f79d3ae71ffb31ed80096904da;p=libucw.git

mainloop: Fixed possible infinite timeouts.
---

diff --git a/ucw/mainloop.c b/ucw/mainloop.c
index d6d9c367..b87ed862 100644
--- a/ucw/mainloop.c
+++ b/ucw/mainloop.c
@@ -485,7 +485,7 @@ main_loop(void)
       if ((tm = clist_head(&main_timer_list)) && tm->expires < wake)
 	wake = tm->expires;
       main_get_time();
-      int timeout = (wake ? wake - main_now : 0);
+      int timeout = ((wake > main_now) ? wake - main_now : 0);
       DBG("MAIN: Poll for %d fds and timeout %d ms", main_file_cnt, timeout);
       int p = poll(main_poll_table, main_file_cnt, timeout);
       timestamp_t old_now = main_now;