Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #14180: Fix the select module to handle correctly the Windows timeval 

structure. timeval.tv_sec is a long on Windows, not time_t.
This commit is contained in:
Victor Stinner 2012-03-14 00:20:51 +01:00
parent 8050ca9c6f
commit b2a3773301
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/selectmodule.c
View File

@ -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;
tv.tv_usec = usec;
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;
}
#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;