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

diff --git a/ChangeLog b/ChangeLog
index 4936154f49145546cd423d7418615229c742fdfe..f1716118b407f18e4eb7d045e3c3f77386df4a2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 aff1de1675f06b5a2e4fd196362f4fc2a083ec03..424d2e1950b231c428c2edd1e8f6099fffd783e8 100644 (file)
--- 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) &&