diff options
| author | Antoine Pitrou <pitrou@free.fr> | 2017-06-30 10:54:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-30 10:54:54 +0200 |
| commit | a45a99b47ff241ce0ae2f0bba59b89e4e012d47c (patch) | |
| tree | 3a1305b56aa6af60ccc2bfc698602a29a57b73e1 /Modules/signalmodule.c | |
| parent | 12536bd261ba95cd2748f3d7d47768742a6ffa7a (diff) | |
| download | cpython-git-a45a99b47ff241ce0ae2f0bba59b89e4e012d47c.tar.gz | |
[2.7] bpo-30807: signal.setitimer() may disable the timer by mistake (GH-2493) (#2499)
* bpo-30807: signal.setitimer() may disable the timer by mistake
* Add NEWS blurb.
(cherry picked from commit 729780a810bbcb12b245a1b652302a601fc9f6fd)
Diffstat (limited to 'Modules/signalmodule.c')
| -rw-r--r-- | Modules/signalmodule.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 1d7ba4ba48..c7bf1f0853 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -111,6 +111,10 @@ timeval_from_double(double d, struct timeval *tv) { tv->tv_sec = floor(d); tv->tv_usec = fmod(d, 1.0) * 1000000.0; + /* Don't disable the timer if the computation above rounds down to zero. */ + if (d > 0.0 && tv->tv_sec == 0 && tv->tv_usec == 0) { + tv->tv_usec = 1; + } } Py_LOCAL_INLINE(double) |