diff options
Diffstat (limited to 'time.c')
| -rw-r--r-- | time.c | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -2217,24 +2217,25 @@ time_init(int argc, VALUE *argv, VALUE time) static void time_overflow_p(time_t *secp, long *nsecp) { - time_t tmp, sec = *secp; + time_t sec = *secp; long nsec = *nsecp; + long sec2; if (nsec >= 1000000000) { /* nsec positive overflow */ - tmp = sec + nsec / 1000000000; - nsec %= 1000000000; - if (sec > 0 && tmp < 0) { + sec2 = nsec / 1000000000; + if (TIMET_MAX - sec2 < sec) { rb_raise(rb_eRangeError, "out of Time range"); } - sec = tmp; + nsec %= 1000000000; + sec += sec2; } if (nsec < 0) { /* nsec negative overflow */ - tmp = sec + NDIV(nsec,1000000000); /* negative div */ - nsec = NMOD(nsec,1000000000); /* negative mod */ - if (sec < 0 && tmp > 0) { + sec2 = NDIV(nsec,1000000000); /* negative div */ + if (sec < TIMET_MAX - sec2) { rb_raise(rb_eRangeError, "out of Time range"); } - sec = tmp; + nsec = NMOD(nsec,1000000000); /* negative mod */ + sec = sec + sec2; } #ifndef NEGATIVE_TIME_T if (sec < 0) |