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

Mark some more BUG lines as unreachable.

Browse Source
This commit is contained in:
Nick Mathewson 2016-11-23 15:33:02 -05:00
parent 9cad2628dd
commit bce0f79252
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/entrynodes.c
View File

@ -539,7 +539,9 @@ remove_guard_from_confirmed_and_primary_lists(guard_selection_t *gs,
found_guard = smartlist_get(gs->confirmed_entry_guards, found_guard = smartlist_get(gs->confirmed_entry_guards,
guard->confirmed_idx); guard->confirmed_idx);
if (BUG(guard != found_guard)) { if (BUG(guard != found_guard)) {
// LCOV_EXCL_START
smartlist_remove_keeporder(gs->confirmed_entry_guards, guard); smartlist_remove_keeporder(gs->confirmed_entry_guards, guard);
// LCOV_EXCL_STOP
} else { } else {
smartlist_del_keeporder(gs->confirmed_entry_guards, smartlist_del_keeporder(gs->confirmed_entry_guards,
guard->confirmed_idx); guard->confirmed_idx);
@ -548,7 +550,9 @@ remove_guard_from_confirmed_and_primary_lists(guard_selection_t *gs,
guard->confirmed_on_date = 0; guard->confirmed_on_date = 0;
} else { } else {
if (BUG(smartlist_contains(gs->confirmed_entry_guards, guard))) { if (BUG(smartlist_contains(gs->confirmed_entry_guards, guard))) {
// LCOV_EXCL_START
smartlist_remove_keeporder(gs->confirmed_entry_guards, guard); smartlist_remove_keeporder(gs->confirmed_entry_guards, guard);
// LCOV_EXCL_STOP
} }
} }
} }
@ -903,10 +907,10 @@ STATIC void
make_guard_confirmed(guard_selection_t *gs, entry_guard_t *guard) make_guard_confirmed(guard_selection_t *gs, entry_guard_t *guard)
{ {
if (BUG(guard->confirmed_on_date && guard->confirmed_idx >= 0)) if (BUG(guard->confirmed_on_date && guard->confirmed_idx >= 0))
return; return; // LCOV_EXCL_LINE
if (BUG(smartlist_contains(gs->confirmed_entry_guards, guard))) if (BUG(smartlist_contains(gs->confirmed_entry_guards, guard)))
return; return; // LCOV_EXCL_LINE
const int GUARD_LIFETIME = GUARD_LIFETIME_DAYS * 86400; const int GUARD_LIFETIME = GUARD_LIFETIME_DAYS * 86400;
guard->confirmed_on_date = randomize_time(approx_time(), GUARD_LIFETIME/10); guard->confirmed_on_date = randomize_time(approx_time(), GUARD_LIFETIME/10);