1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix _PyTime_AsTimevalStruct_impl() on OpenBSD

Browse Source 
On the x86 OpenBSD 5.8 buildbot, the integer overflow check is ignored. Copy
the tv_sec variable into a Py_time_t variable instead of "simply" casting it to
Py_time_t, to fix the integer overflow check.
This commit is contained in:
Victor Stinner 2015-10-01 08:44:03 +02:00
parent 0d30940dd2
commit b7a8af20ff
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Python/pytime.c
View File

@ -454,7 +454,7 @@ static int
_PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv, _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv,
_PyTime_round_t round, int raise) _PyTime_round_t round, int raise)
{ {
_PyTime_t secs; _PyTime_t secs, secs2;
int us; int us;
int res; int res;
@ -467,7 +467,8 @@ _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv,
#endif #endif
tv->tv_usec = us; tv->tv_usec = us;
if (res < 0 || (_PyTime_t)tv->tv_sec != secs) { secs2 = (_PyTime_t)tv->tv_sec;
if (res < 0 || secs2 != secs) {
if (raise) if (raise)
error_time_t_overflow(); error_time_t_overflow();
return -1; return -1;