commit 48558ed1aa070ef121b339eef88e7822f8e45978 Merge: 73ee161 2491ead Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 11 00:11:26 2014 -0400
Merge remote-tracking branch 'public/bug13104_025'
changes/bug13104 | 4 + src/common/util.c | 31 ++++++-- src/or/routerlist.c | 5 +- src/test/test_dir.c | 27 +++++++ src/test/test_util.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 256 insertions(+), 22 deletions(-)
diff --cc src/or/routerlist.c index a018181,0df411b..1faa05f --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -1804,10 -1802,10 +1804,10 @@@ scale_array_elements_to_u64(u64_dbl_t * uint64_t *total_out) { double total = 0.0; - double scale_factor; + double scale_factor = 0.0; int i; /* big, but far away from overflowing an int64_t */ -#define SCALE_TO_U64_MAX (INT64_MAX / 4) +#define SCALE_TO_U64_MAX ((int64_t) (INT64_MAX / 4))
for (i = 0; i < n_entries; ++i) total += entries[i].dbl;