Commit b7a8af2
committed
Fix _PyTime_AsTimevalStruct_impl() on OpenBSD
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.1 parent 0d30940 commit b7a8af2
1 file changed
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -454,7 +454,7 @@ static int | |||
| 454 | 454 | _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv, | |
| 455 | 455 | _PyTime_round_t round, int raise) | |
| 456 | 456 | { | |
| 457 | - _PyTime_t secs; | ||
| 457 | + _PyTime_t secs, secs2; | ||
| 458 | 458 | int us; | |
| 459 | 459 | int res; | |
| 460 | 460 | ||
@@ -467,7 +467,8 @@ _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv, | |||
| 467 | 467 | #endif | |
| 468 | 468 | tv->tv_usec = us; | |
| 469 | 469 | ||
| 470 | - if (res < 0 || (_PyTime_t)tv->tv_sec != secs) { | ||
| 470 | + secs2 = (_PyTime_t)tv->tv_sec; | ||
| 471 | + if (res < 0 || secs2 != secs) { | ||
| 471 | 472 | if (raise) | |
| 472 | 473 | error_time_t_overflow(); | |
| 473 | 474 | return -1; | |
0 commit comments