mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-21 05:26:20 +02:00
Merge remote-tracking branch 'public/bug21129'
This commit is contained in:
commit
2e93bffa1d
4
changes/bug21129
Normal file
4
changes/bug21129
Normal file
@ -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.
|
||||||
|
|
@ -1112,18 +1112,7 @@ remove_guard_from_confirmed_and_primary_lists(guard_selection_t *gs,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (guard->confirmed_idx >= 0) {
|
if (guard->confirmed_idx >= 0) {
|
||||||
entry_guard_t *found_guard = NULL;
|
smartlist_remove_keeporder(gs->confirmed_entry_guards, guard);
|
||||||
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);
|
|
||||||
}
|
|
||||||
guard->confirmed_idx = -1;
|
guard->confirmed_idx = -1;
|
||||||
guard->confirmed_on_date = 0;
|
guard->confirmed_on_date = 0;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user