From: Roger Dingledine <arma@torproject.org>
Date: Fri, 21 Dec 2007 22:58:22 +0000 (+0000)
Subject: Fix a crash when we fetch a descriptor that turns out to be
X-Git-Tag: tor-0.2.0.14-alpha~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73ff2e5d5e1edaf4c6295035e73090c775512a23;p=thirdparty%2Ftor.git

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 4936154f49..f1716118b4 100644
--- 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 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) &&