nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a warning from the clangalyzer.

Browse Source
This commit is contained in:
Nick Mathewson 2015-05-29 14:08:51 -04:00
parent 27bc0da14d
commit 10dd50dfcb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/dirvote.c
View File

@ -1143,6 +1143,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
dircollator_t *collator = NULL;
tor_assert(flavor == FLAV_NS || flavor == FLAV_MICRODESC);
tor_assert(total_authorities >= smartlist_len(votes));
tor_assert(total_authorities > 0);
flavor_name = networkstatus_get_flavor_name(flavor);
@ -1535,7 +1536,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
/* Okay, go through all the entries for this digest. */
for (int voter_idx = 0; voter_idx < smartlist_len(votes); ++voter_idx) {
if (vrs_lst[voter_idx] == NULL)
continue; /* This voter had nothig to say about this entry. */
continue; /* This voter had nothing to say about this entry. */
rs = vrs_lst[voter_idx];
++n_listing;
@ -1579,6 +1580,10 @@ networkstatus_compute_consensus(smartlist_t *votes,
if (n_listing <= total_authorities/2)
continue;
/* The clangalyzer can't figure out that this will never be NULL
* if n_listing is at least 1 */
tor_assert(current_rsa_id);
/* Figure out the most popular opinion of what the most recent
* routerinfo and its contents are. */
memset(microdesc_digest, 0, sizeof(microdesc_digest));