From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Sep 2017 17:58:35 +0000 (-0400)
Subject: Avoid integer error in TEST_BITOPS tests
X-Git-Tag: tor-0.3.2.2-alpha~79^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10ea3343b52104d9a1f81f2b0ff25e7c0d733fef;p=thirdparty%2Ftor.git

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.
---

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;