From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Sep 2014 04:11:26 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug13104_025'
X-Git-Tag: tor-0.2.6.1-alpha~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48558ed1aa070ef121b339eef88e7822f8e45978;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug13104_025'
---

48558ed1aa070ef121b339eef88e7822f8e45978
diff --cc src/or/routerlist.c
index a018181026,0df411b822..1faa05f06f
--- 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;