summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'Modules')
-rw-r--r--Modules/selectmodule.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 19d9d3b..9cb7481 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -223,10 +223,23 @@ select_select(PyObject *self, PyObject *args)
return NULL;
}
else {
- long usec;
- if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &usec) == -1)
+#ifdef MS_WINDOWS
+ time_t sec;
+ if (_PyTime_ObjectToTimeval(tout, &sec, &tv.tv_usec) == -1)
+ return NULL;
+ assert(sizeof(tv.tv_sec) == sizeof(long));
+#if SIZEOF_TIME_T > SIZEOF_LONG
+ if (sec > LONG_MAX) {
+ PyErr_SetString(PyExc_OverflowError,
+ "timeout is too large");
return NULL;
- tv.tv_usec = usec;
+ }
+#endif
+ tv.tv_sec = (long)sec;
+#else
+ if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv.tv_usec) == -1)
+ return NULL;
+#endif
if (tv.tv_sec < 0) {
PyErr_SetString(PyExc_ValueError, "timeout must be non-negative");
return NULL;