diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-13 10:34:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-14 09:51:24 -0400 |
| commit | 37953497d8689bdde65837b00f56bf8ff1e0e459 (patch) | |
| tree | eba5ce37971b301dffc9fe788b2ab1d439717284 /src/test | |
| parent | 582f2187a769ea723f6bf13bc91f7a4b3c861408 (diff) | |
| download | tor-37953497d8689bdde65837b00f56bf8ff1e0e459.tar.gz tor-37953497d8689bdde65837b00f56bf8ff1e0e459.zip | |
Don't compute ((uint64_t)1)<<64 in round_to_power_of_2
This would be undefined behavior if it happened. (It can't actually
happen as we're using round_to_power_of_2, since we would have to
be trying to allocate exabytes of data.)
While we're at it, fix the behavior of round_to_power_of_2(0),
and document the function better.
Fix for bug 6831.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_util.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 7ef4d1f78c..2a194ef840 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -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: ; |