瀏覽代碼

Fix an assert error introduced in 0.1.2.5-alpha: if you're an
advertised exit node, somebody might try to exit from you when
you're bootstrapping and before you've built your descriptor yet.


svn:r9305

Roger Dingledine 17 年之前
父節點
當前提交
c85ff4d6ab
共有 2 個文件被更改,包括 7 次插入1 次删除
  1. 5 0
      ChangeLog
  2. 2 1
      src/or/router.c

+ 5 - 0
ChangeLog

@@ -30,6 +30,11 @@ Changes in version 0.1.2.6-alpha - 2007-??-??
     - Authorities do not recommend exits as guards if this would shift
       excess load to the exit nodes.
 
+  o Major bugfixes:
+    - Fix an assert error introduced in 0.1.2.5-alpha: if you're an
+      advertised exit node, somebody might try to exit from you when
+      you're bootstrapping and before you've built your descriptor yet.
+
   o Minor bugfixes:
     - Restore a warning message if we accidentally resolve an address that
       we weren't planning to resolve.

+ 2 - 1
src/or/router.c

@@ -701,7 +701,8 @@ router_upload_dir_desc_to_dirservers(int force)
 int
 router_compare_to_my_exit_policy(edge_connection_t *conn)
 {
-  tor_assert(desc_routerinfo);
+  if (!router_get_my_routerinfo()) /* make sure desc_routerinfo exists */
+    return -1;
 
   /* make sure it's resolved to something. this way we can't get a
      'maybe' below. */