mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug21128'

Browse source
This commit is contained in:
Nick Mathewson 2017-02-01 09:01:28 -05:00
commit f8885b76ef
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/bug21128 Normal file
View file

@ -0,0 +1,5 @@
o Minor bugfixes (client, entry guards):
- Fix a bug warning (with backtrace) when we fail a channel
that circuits to fallback directories on it. Fixes bug 21128;
bugfix on 0.3.0.1-alpha.

6
src/or/entrynodes.c
View file

@ -2172,7 +2172,11 @@ entry_guard_chan_failed(channel_t *chan)
continue;
origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ);
entry_guard_failed(&origin_circ->guard_state);
if (origin_circ->guard_state) {
/* We might have no guard state if we didn't use a guard on this
* circuit (eg it's for a fallback directory). */
entry_guard_failed(&origin_circ->guard_state);
}
} SMARTLIST_FOREACH_END(circ);
smartlist_free(pending);
}