nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug6831_v2'

Browse Source
This commit is contained in:
Nick Mathewson 2012-09-14 09:54:08 -04:00
commit 6492a75b9f
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug6831 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Fix round_to_power_of_2 so it doesn't invoke undefined behavior
with large values. This was untriggered, but nevertheless incorrect.
Fixes bug 6831; bugfix on 0.2.0.1-alpha.

18
src/common/util.c
View File

@ -394,12 +394,24 @@ tor_log2(uint64_t u64)
return r;
}
/** Return the power of 2 closest to <b>u64</b>. */
/** Return the power of 2 in range [1,UINT64_MAX] closest to <b>u64</b>. If
* there are two powers of 2 equally close, round down. */
uint64_t
round_to_power_of_2(uint64_t u64)
{
int lg2 = tor_log2(u64);
uint64_t low = U64_LITERAL(1) << lg2, high = U64_LITERAL(1) << (lg2+1);
int lg2;
uint64_t low;
uint64_t high;
if (u64 == 0)
return 1;
lg2 = tor_log2(u64);
low = U64_LITERAL(1) << lg2;
if (lg2 == 63)
return low;
high = U64_LITERAL(1) << (lg2+1);
if (high - u64 < u64 - low)
return high;
else

13
src/test/test_util.c
View File

@ -1109,6 +1109,7 @@ test_util_pow2(void)
test_eq(tor_log2(64), 6);
test_eq(tor_log2(65), 6);
test_eq(tor_log2(63), 5);
test_eq(tor_log2(0), 0); /* incorrect mathematically, but as specified */
test_eq(tor_log2(1), 0);
test_eq(tor_log2(2), 1);
test_eq(tor_log2(3), 1);
@ -1123,7 +1124,17 @@ test_util_pow2(void)
test_eq(round_to_power_of_2(130), 128);
test_eq(round_to_power_of_2(U64_LITERAL(40000000000000000)),
U64_LITERAL(1)<<55);
test_eq(round_to_power_of_2(0), 2);
test_eq(round_to_power_of_2(U64_LITERAL(0xffffffffffffffff)),
U64_LITERAL(1)<<63);
test_eq(round_to_power_of_2(0), 1);
test_eq(round_to_power_of_2(1), 1);
test_eq(round_to_power_of_2(2), 2);
test_eq(round_to_power_of_2(3), 2);
test_eq(round_to_power_of_2(4), 4);
test_eq(round_to_power_of_2(4), 4);
test_eq(round_to_power_of_2(5), 4);
test_eq(round_to_power_of_2(6), 4);
test_eq(round_to_power_of_2(7), 8);
done:
;