summaryrefslogtreecommitdiff
path: root/src/ext/timeouts
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-19 13:58:35 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-19 13:58:35 -0400
commit10ea3343b52104d9a1f81f2b0ff25e7c0d733fef (patch)
tree7bbafeebb61253161eb1c36c7fa7e6fe4483225f /src/ext/timeouts
parent42e12a3537fef04ab77defd6cb5581add439de43 (diff)
downloadtor-10ea3343b52104d9a1f81f2b0ff25e7c0d733fef.tar.gz
tor-10ea3343b52104d9a1f81f2b0ff25e7c0d733fef.zip
Avoid integer error in TEST_BITOPS tests
If "1" is not 64 bits wide already, then "1 << i" will not actually work. This bug only affects the TEST_BITOPS code, and shouldn't matter for the actual use of the timeout code (except if/when it causes this test to fail). Reported by dcb314@hotmail.com. Fix for bug 23583. Not adding a changes file, since this code is never compiled into Tor.
Diffstat (limited to 'src/ext/timeouts')
-rw-r--r--src/ext/timeouts/timeout-bitops.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ext/timeouts/timeout-bitops.c b/src/ext/timeouts/timeout-bitops.c
index a018f33b95..e99af8f9c4 100644
--- a/src/ext/timeouts/timeout-bitops.c
+++ b/src/ext/timeouts/timeout-bitops.c
@@ -231,7 +231,8 @@ main(int c, char **v)
int result = 0;
for (i = 0; i <= 63; ++i) {
- uint64_t x = 1 << i;
+ uint64_t x = 1;
+ x <<= i;
if (!check(x))
result = 1;
--x;