oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

roken: Overflow prot. timeval add/sub

Browse Source
This commit is contained in:
Nicolas Williams
2022-02-15 16:54:13 -06:00
parent 1193bd5e74
commit fe8d4f2883
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/roken/timeval.c
View File

@@ -101,7 +101,7 @@ rk_time_sub(time_t t, time_t delta)
return t; return t;
#ifdef TIME_T_SIGNED #ifdef TIME_T_SIGNED
if (delta > 0) if (delta > 0)
return time_add(t, -delta); return rk_time_add(t, -delta);
#if SIZEOF_TIME_T == 4 #if SIZEOF_TIME_T == 4
if (delta == INT32_MIN) { if (delta == INT32_MIN) {
if (t < 0) { if (t < 0) {
@@ -110,8 +110,8 @@ rk_time_sub(time_t t, time_t delta)
} }
return INT32_MAX; return INT32_MAX;
} }
/* Safe to compute -delta, so use time_add() to add -delta */ /* Safe to compute -delta, so use rk_time_add() to add -delta */
return time_add(t, -delta); return rk_time_add(t, -delta);
#elif SIZEOF_TIME_T == 8 #elif SIZEOF_TIME_T == 8
if (delta == INT64_MIN) { if (delta == INT64_MIN) {
if (t < 0) { if (t < 0) {
@@ -120,7 +120,7 @@ rk_time_sub(time_t t, time_t delta)
} }
return INT64_MAX; return INT64_MAX;
} }
return time_add(t, -delta); return rk_time_add(t, -delta);
#else #else
#error "Unexpected sizeof(time_t)" #error "Unexpected sizeof(time_t)"
#endif #endif
@@ -140,11 +140,11 @@ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
timevalfix(struct timeval *t1) timevalfix(struct timeval *t1)
{ {
if (t1->tv_usec < 0) { if (t1->tv_usec < 0) {
t1->tv_sec--; t1->tv_sec = rk_time_sub(t1->tv_sec, 1);
t1->tv_usec += 1000000; t1->tv_usec = 1000000;
} }
if (t1->tv_usec >= 1000000) { if (t1->tv_usec >= 1000000) {
t1->tv_sec++; t1->tv_sec = rk_time_add(t1->tv_sec, 1);
t1->tv_usec -= 1000000; t1->tv_usec -= 1000000;
} }
} }
@@ -156,7 +156,7 @@ timevalfix(struct timeval *t1)
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
timevaladd(struct timeval *t1, const struct timeval *t2) timevaladd(struct timeval *t1, const struct timeval *t2)
{ {
t1->tv_sec += t2->tv_sec; t1->tv_sec = rk_time_add(t1->tv_sec, t2->tv_sec);
t1->tv_usec += t2->tv_usec; t1->tv_usec += t2->tv_usec;
timevalfix(t1); timevalfix(t1);
} }
@@ -168,7 +168,7 @@ timevaladd(struct timeval *t1, const struct timeval *t2)
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
timevalsub(struct timeval *t1, const struct timeval *t2) timevalsub(struct timeval *t1, const struct timeval *t2)
{ {
t1->tv_sec -= t2->tv_sec; t1->tv_sec = rk_time_sub(t1->tv_sec, t2->tv_sec);
t1->tv_usec -= t2->tv_usec; t1->tv_usec -= t2->tv_usec;
timevalfix(t1); timevalfix(t1);
} }