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
This commit is contained in:
Roger Dingledine 2007-12-21 22:58:22 +00:00
parent 57c26115fc
commit 73ff2e5d5e
2 changed files with 8 additions and 0 deletions

View File

@ -1,4 +1,10 @@
Changes in version 0.2.0.14-alpha - 2007-12-?? 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: o Minor bugfixes:
- Make the unit tests build again. - Make the unit tests build again.

View File

@ -2853,6 +2853,8 @@ clear_bridge_list(void)
static bridge_info_t * static bridge_info_t *
routerinfo_get_configured_bridge(routerinfo_t *ri) routerinfo_get_configured_bridge(routerinfo_t *ri)
{ {
if (!bridge_list)
return NULL;
SMARTLIST_FOREACH(bridge_list, bridge_info_t *, bridge, SMARTLIST_FOREACH(bridge_list, bridge_info_t *, bridge,
{ {
if (tor_digest_is_zero(bridge->identity) && if (tor_digest_is_zero(bridge->identity) &&