diff options
author | Antoine Pitrou <pitrou@free.fr> | 2017-06-30 10:01:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-30 10:01:05 +0200 |
commit | 729780a810bbcb12b245a1b652302a601fc9f6fd (patch) | |
tree | 98182b9933e15696fbf1dc97364f6e048c219600 /Modules/signalmodule.c | |
parent | 42bc8beadd49f60cc52fdc397897b3bd81640406 (diff) | |
download | cpython-git-729780a810bbcb12b245a1b652302a601fc9f6fd.tar.gz |
bpo-30807: signal.setitimer() may disable the timer by mistake (#2493)
* bpo-30807: signal.setitimer() may disable the timer by mistake
* Add NEWS blurb
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 cbf0d54305..b511d17c38 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -139,6 +139,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) |