nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Workaround a test bug

Browse Source
This commit is contained in:
Nick Mathewson 2016-08-25 14:28:57 -04:00
parent a3e82563df
commit d97a385535
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/protover.c
View File

@ -392,6 +392,8 @@ contract_protocol_list(const smartlist_t *proto_strings)
// Parse each item and stick it entry_lists_by_name. Build // Parse each item and stick it entry_lists_by_name. Build
// 'all_names' at the same time. // 'all_names' at the same time.
SMARTLIST_FOREACH_BEGIN(proto_strings, const char *, s) { SMARTLIST_FOREACH_BEGIN(proto_strings, const char *, s) {
if (BUG(!s))
continue;// LCOV_EXCL_LINE
proto_entry_t *ent = parse_single_entry(s, s+strlen(s)); proto_entry_t *ent = parse_single_entry(s, s+strlen(s));
if (BUG(!ent)) if (BUG(!ent))
continue; // LCOV_EXCL_LINE continue; // LCOV_EXCL_LINE
@ -513,14 +515,14 @@ compute_protover_vote(const smartlist_t *list_of_proto_strings,
if (!strcmp(ent, cur_entry)) { if (!strcmp(ent, cur_entry)) {
n_times++; n_times++;
} else { } else {
if (n_times >= threshold) if (n_times >= threshold && cur_entry)
smartlist_add(include_entries, (void*)cur_entry); smartlist_add(include_entries, (void*)cur_entry);
cur_entry = ent; cur_entry = ent;
n_times = 1 ; n_times = 1 ;
} }
} SMARTLIST_FOREACH_END(ent); } SMARTLIST_FOREACH_END(ent);
if (n_times >= threshold) if (n_times >= threshold && cur_entry)
smartlist_add(include_entries, (void*)cur_entry); smartlist_add(include_entries, (void*)cur_entry);
// Finally, compress that list. // Finally, compress that list.