Avoid timeouts of ULONG_MAX milliseconds. Stops the X server from crashing

with "select returned EINVAL" messages.

ok matthieu@

1 files changed, 2 insertions, 5 deletions

diff --git a/xserver/Xext/sync.c b/xserver/Xext/sync.c
index 9b4d0a474..1e3d43ee6 100644
--- a/xserver/Xext/sync.c
+++ b/xserver/Xext/sync.c
@@ -2686,27 +2686,24 @@ IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMa
          * If we've been idle more than it, and someone wants to know about
          * that level-triggered, schedule an immediate wakeup.
          */
-        unsigned long timeout = -1;
 
         if (XSyncValueLessThan(idle, *greater)) {
             XSyncValue value;
             Bool overflow;
 
             XSyncValueSubtract(&value, *greater, idle, &overflow);
-            timeout = min(timeout, XSyncValueLow32(value));
+            AdjustWaitForDelay(wt, XSyncValueLow32(value));
         }
         else {
             for (list = counter->sync.pTriglist; list;
                  list = list->next) {
                 trig = list->pTrigger;
                 if (trig->CheckTrigger(trig, old_idle)) {
-                    timeout = min(timeout, 0);
+                    AdjustWaitForDelay(wt, 0);
                     break;
                 }
             }
         }
-
-        AdjustWaitForDelay(wt, timeout);
     }
 
     counter->value = old_idle;  /* pop */