From b2a37733017c4a469147d00d539e5313afc19340 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 14 Mar 2012 00:20:51 +0100 Subject: [PATCH] Issue #14180: Fix the select module to handle correctly the Windows timeval structure. timeval.tv_sec is a long on Windows, not time_t. --- Modules/selectmodule.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 19d9d3b9f64..9cb7481f24e 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; - 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;