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 | |
| parent | 57c26115fc2227fbabadcdcc51dbbd67ee4d7fa5 (diff) | |
| download | tor-73ff2e5d5e1edaf4c6295035e73090c775512a23.tar.gz tor-73ff2e5d5e1edaf4c6295035e73090c775512a23.zip | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
2 files changed, 8 insertions, 0 deletions
@@ -1,4 +1,10 @@ Changes in version 0.2.0.14-alpha - 2007-12-?? + o Major bugfixes: + - 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. + o Minor bugfixes: - Make the unit tests build again. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index aff1de1675..424d2e1950 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) && |