1 files changed, 8 insertions, 0 deletions

diff --git a/apps/openssl/compat/poll_win.c b/apps/openssl/compat/poll_win.c
index 0d15522..8e28349 100644
--- a/apps/openssl/compat/poll_win.c
+++ b/apps/openssl/compat/poll_win.c
@@ -264,6 +264,14 @@ poll(struct pollfd *pfds, nfds_t nfds, int timeout_ms)
 
         do {
                 TIMEVAL tv;
+
+                /*
+                 * Cap the wait at the time remaining so the final pass
+                 * does not overshoot the requested timeout.
+                 */
+                if (timeout_ms != -1 && timeout_ms - timespent_ms < looptime_ms)
+                        looptime_ms = timeout_ms - timespent_ms;
+
                 tv.tv_sec = 0;
                 tv.tv_usec = looptime_ms * 1000;
                 int handle_signaled = 0;