diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-12-21 22:58:22 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-12-21 22:58:22 +0000 |
| commit | 73ff2e5d5e1edaf4c6295035e73090c775512a23 (patch) | |
| tree | 6fed88e5294dd28fb3be8bf26443d84a8911e866 /src/or/circuitbuild.c | |
| parent | 57c26115fc2227fbabadcdcc51dbbd67ee4d7fa5 (diff) | |
| download | tor-73ff2e5d5e1edaf4c6295035e73090c775512a23.tar tor-73ff2e5d5e1edaf4c6295035e73090c775512a23.tar.gz | |
Fix a crash when we fetch a descriptor that turns out to be
unexpected (it used to be in our networkstatus when we started
fetching it, but it isn't in our current networkstatus), and we
aren't using bridges. Bugfix on 0.2.0.x.
svn:r12911
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index aff1de167..424d2e195 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2853,6 +2853,8 @@ clear_bridge_list(void) static bridge_info_t * routerinfo_get_configured_bridge(routerinfo_t *ri) { + if (!bridge_list) + return NULL; SMARTLIST_FOREACH(bridge_list, bridge_info_t *, bridge, { if (tor_digest_is_zero(bridge->identity) && |