From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 9 Nov 2010 23:53:33 +0000 (+0000)
Subject: Fix timeval struct initialization in wxSelectDispatcher.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/947d5ad04c33e805f25c6671e62ab826ac841ad8?ds=inline

Fix timeval struct initialization in wxSelectDispatcher.

The tv_usec field could overflow its maximal value while tv_sec was always
left 0.

It would be even better to reuse SetTimeValFromMS() from socket.cpp here in
the future.

See #11542.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/selectdispatcher.cpp b/src/common/selectdispatcher.cpp
index 7e693c54ca..fd0a26938c 100644
--- a/src/common/selectdispatcher.cpp
+++ b/src/common/selectdispatcher.cpp
@@ -220,8 +220,8 @@ int wxSelectDispatcher::DoSelect(wxSelectSets& sets, int timeout) const
     if ( timeout != TIMEOUT_INFINITE )
     {
         ptv = &tv;
-        tv.tv_sec = 0;
-        tv.tv_usec = timeout*1000;
+        tv.tv_sec = timeout / 1000;
+        tv.tv_usec = (timeout % 1000)*1000;
     }
     else // no timeout
     {