torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug19483: avoid range checks when they are always true

Browse Source 
Some compilers are smart enough to work out that comparisons to
LONG_MAX are a no-op on L64.
This commit is contained in:
teor (Tim Wilson-Brown)
2016-06-30 09:19:33 +10:00
parent 11ba7f0037
commit aae14f8346
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/util.c
+10 -4
View File
@@ -1451,11 +1451,14 @@ tv_udiff(const struct timeval *start, const struct timeval *end)
* between 0 and TV_USEC_PER_SEC. */
udiff = secdiff*1000000 + ((int64_t)end->tv_usec - (int64_t)start->tv_usec);
/* Some compilers are smart enough to work out this is a no-op on L64 */
#if SIZEOF_LONG < 8
if (udiff > (int64_t)LONG_MAX || udiff < (int64_t)LONG_MIN) {
return LONG_MAX;
} else {
return (long)udiff;
}
#endif
return (long)udiff;
}
/** Return the number of milliseconds elapsed between *start and *end.
@@ -1507,11 +1510,14 @@ tv_mdiff(const struct timeval *start, const struct timeval *end)
((int64_t)end->tv_usec - (int64_t)start->tv_usec + 500 + 1000000) / 1000
- 1000;
/* Some compilers are smart enough to work out this is a no-op on L64 */
#if SIZEOF_LONG < 8
if (mdiff > (int64_t)LONG_MAX || mdiff < (int64_t)LONG_MIN) {
return LONG_MAX;
} else {
return (long)mdiff;
}
#endif
return (long)mdiff;
}
/**