浏览代码

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

Roger Dingledine 18 年之前
父节点
当前提交
73ff2e5d5e
共有 2 个文件被更改,包括 8 次插入0 次删除
  1. 6 0
      ChangeLog
  2. 2 0
      src/or/circuitbuild.c

+ 6 - 0
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.
 

+ 2 - 0
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) &&