diff options
| author | Daniel Sabogal <dsabogal@ufl.edu> | 2016-11-02 22:29:36 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-11-07 13:00:54 -0500 |
| commit | bc1e7731cee963e422575f81048792f4d5db9641 (patch) | |
| tree | 8433b8861dad5d43307ef5000e150a8a594a1a47 | |
| parent | 5ffe515ca485c8e6e57cd5acda6bc6008f85660c (diff) | |
| download | musl-bc1e7731cee963e422575f81048792f4d5db9641.tar.gz musl-bc1e7731cee963e422575f81048792f4d5db9641.tar.bz2 musl-bc1e7731cee963e422575f81048792f4d5db9641.tar.xz musl-bc1e7731cee963e422575f81048792f4d5db9641.zip | |
fix integer overflow of tm_year in __secs_to_tm
the overflow check for years+100 did not account for the extra
year computed from the remaining months. instead, perform this
check after obtaining the final number of years.
| -rw-r--r-- | src/time/__secs_to_tm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/time/__secs_to_tm.c b/src/time/__secs_to_tm.c index 3a3123a1..093d9021 100644 --- a/src/time/__secs_to_tm.c +++ b/src/time/__secs_to_tm.c @@ -60,15 +60,16 @@ int __secs_to_tm(long long t, struct tm *tm) for (months=0; days_in_month[months] <= remdays; months++) remdays -= days_in_month[months]; + if (months >= 10) { + months -= 12; + years++; + } + if (years+100 > INT_MAX || years+100 < INT_MIN) return -1; tm->tm_year = years + 100; tm->tm_mon = months + 2; - if (tm->tm_mon >= 12) { - tm->tm_mon -=12; - tm->tm_year++; - } tm->tm_mday = remdays + 1; tm->tm_wday = wday; tm->tm_yday = yday; |