[or-cvs] r9305: Fix an assert error introduced in 0.1.2.5-alpha: if you're a (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-01-08 19:37:13 -0500 (Mon, 08 Jan 2007)
New Revision: 9305

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/router.c
Log:
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.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-01-09 00:28:56 UTC (rev 9304)
+++ tor/trunk/ChangeLog	2007-01-09 00:37:13 UTC (rev 9305)
@@ -30,6 +30,11 @@
     - 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.

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-01-09 00:28:56 UTC (rev 9304)
+++ tor/trunk/src/or/router.c	2007-01-09 00:37:13 UTC (rev 9305)
@@ -701,7 +701,8 @@
 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. */