nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add an assertion to try to please coverity.

Browse Source 
Coverity, for some reason, thought that weight_scale might be 0,
leading to a divide-by-zero error.
This commit is contained in:
Nick Mathewson 2017-07-28 10:17:14 -04:00
parent 602c52cad4
commit decb927685
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/routerparse.c
View File

@ -2854,7 +2854,6 @@ compare_vote_routerstatus_entries(const void **_a, const void **_b)
int int
networkstatus_verify_bw_weights(networkstatus_t *ns, int consensus_method) networkstatus_verify_bw_weights(networkstatus_t *ns, int consensus_method)
{ {
int64_t weight_scale;
int64_t G=0, M=0, E=0, D=0, T=0; int64_t G=0, M=0, E=0, D=0, T=0;
double Wgg, Wgm, Wgd, Wmg, Wmm, Wme, Wmd, Weg, Wem, Wee, Wed; double Wgg, Wgm, Wgd, Wmg, Wmm, Wme, Wmd, Weg, Wem, Wee, Wed;
double Gtotal=0, Mtotal=0, Etotal=0; double Gtotal=0, Mtotal=0, Etotal=0;
@ -2862,7 +2861,8 @@ networkstatus_verify_bw_weights(networkstatus_t *ns, int consensus_method)
int valid = 1; int valid = 1;
(void) consensus_method; (void) consensus_method;
weight_scale = networkstatus_get_weight_scale_param(ns); const int64_t weight_scale = networkstatus_get_weight_scale_param(ns);
tor_assert(weight_scale >= 1);
Wgg = networkstatus_get_bw_weight(ns, "Wgg", -1); Wgg = networkstatus_get_bw_weight(ns, "Wgg", -1);
Wgm = networkstatus_get_bw_weight(ns, "Wgm", -1); Wgm = networkstatus_get_bw_weight(ns, "Wgm", -1);
Wgd = networkstatus_get_bw_weight(ns, "Wgd", -1); Wgd = networkstatus_get_bw_weight(ns, "Wgd", -1);