mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-28 06:13:31 +01:00
Avoid crashing if we call num_usable_bridges() when bridges are not enabled
This applies the changes in 23524 to num_usable_bridges(), because it has replaced any_bridge_descriptors_known(). The original changes file still applies.
This commit is contained in:
parent
690f646bf8
commit
d7833c9d27
@ -3145,9 +3145,13 @@ num_bridges_usable,(void))
|
||||
{
|
||||
int n_options = 0;
|
||||
|
||||
tor_assert(get_options()->UseBridges);
|
||||
if (BUG(!get_options()->UseBridges)) {
|
||||
return 0;
|
||||
}
|
||||
guard_selection_t *gs = get_guard_selection_info();
|
||||
tor_assert(gs->type == GS_TYPE_BRIDGE);
|
||||
if (BUG(gs->type != GS_TYPE_BRIDGE)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) {
|
||||
if (guard->is_reachable == GUARD_REACHABLE_NO)
|
||||
|
Loading…
Reference in New Issue
Block a user