From 0e12395190a54ce91fdc37593601f481cfcf3e70 Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Thu, 29 Jun 2000 21:31:02 +0000 Subject: Trent Mick : This patch fixes a possible overflow in the Sleep system call on Win32/64 in the time_sleep() function in the time module. For very large values of the give time to sleep the number of milliseconds can overflow and give unexpected sleep intervals. THis patch raises an OverflowError if the value overflows. Closes SourceForge patch #100514. --- Modules/timemodule.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index fa7a635..cebcc68 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -835,10 +835,17 @@ floatsleep(double secs) } #else /* !MSDOS */ #ifdef MS_WIN32 - /* XXX Can't interrupt this sleep */ - Py_BEGIN_ALLOW_THREADS - Sleep((int)(secs*1000)); - Py_END_ALLOW_THREADS + { + double millisecs = secs * 1000.0; + if (millisecs > (double)ULONG_MAX) { + PyErr_SetString(PyExc_OverflowError, "sleep length is too large"); + return -1; + } + /* XXX Can't interrupt this sleep */ + Py_BEGIN_ALLOW_THREADS + Sleep((unsigned long)millisecs); + Py_END_ALLOW_THREADS + } #else /* !MS_WIN32 */ #ifdef PYOS_OS2 /* This Sleep *IS* Interruptable by Exceptions */ -- cgit v0.12