commit 0f0d4356b21df48f1832c3de606eb70e16e94566 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 31 14:34:32 2017 -0500

Don't try to use confirmed_idx in remove_guard_from_...lists()

Since we can call this function more than once before we update all the confirmed_idx fields, we can't rely on all the relays having an accurate confirmed_idx.

Fixes bug 21129; bugfix on 0.3.0.1-alpha --- changes/bug21129 | 4 ++++ src/or/entrynodes.c | 13 +------------ 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/changes/bug21129 b/changes/bug21129 new file mode 100644 index 0000000..5a09bb4 --- /dev/null +++ b/changes/bug21129 @@ -0,0 +1,4 @@ + o Minor bugfixes (client, entry guards): + - Fix a spurious bug warning (with backtrace) when removing an + expired entry guard. Fixes bug 21129; bugfix on 0.3.0.1-alpha. + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index c5fb92e..30a1f4b 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1112,18 +1112,7 @@ remove_guard_from_confirmed_and_primary_lists(guard_selection_t *gs, }

if (guard->confirmed_idx >= 0) { - entry_guard_t *found_guard = NULL; - if (guard->confirmed_idx < smartlist_len(gs->confirmed_entry_guards)) - found_guard = smartlist_get(gs->confirmed_entry_guards, - guard->confirmed_idx); - if (BUG(guard != found_guard)) { - // LCOV_EXCL_START - smartlist_remove_keeporder(gs->confirmed_entry_guards, guard); - // LCOV_EXCL_STOP - } else { - smartlist_del_keeporder(gs->confirmed_entry_guards, - guard->confirmed_idx); - } + smartlist_remove_keeporder(gs->confirmed_entry_guards, guard); guard->confirmed_idx = -1; guard->confirmed_on_date = 0; } else {