Merge branch 'bug21495'

This commit is contained in:
Nick Mathewson 2017-07-07 13:03:36 -04:00
commit eb01f35149

View File

@ -737,12 +737,12 @@ dirvote_get_intermediate_param_value(const smartlist_t *param_list,
}
} SMARTLIST_FOREACH_END(k_v_pair);
if (n_found == 1)
if (n_found == 1) {
return value;
else if (BUG(n_found > 1))
return default_val;
else
} else {
tor_assert_nonfatal(n_found == 0);
return default_val;
}
}
/** Minimum number of directory authorities voting for a parameter to