Fix the router_compare_to_my_exit_policy assertion failure once-and-for-all, by decla...

svn:r2017

diff --git a/src/or/router.c b/src/or/router.c
index 523abb577310db06b74e9cee9dc337d3f8c1c466..9e36009b8a831fc46a8f92d2acb8b52242b29f64 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -381,8 +381,13 @@ static void router_add_exit_policy_from_config(routerinfo_t *router) {
 int router_compare_to_my_exit_policy(connection_t *conn)
 {
   tor_assert(desc_routerinfo);
-  tor_assert(conn->addr); /* make sure it's resolved to something. this
-                             way we can't get a 'maybe' below. */
+
+  /* make sure it's resolved to something. this way we can't get a
+     'maybe' below. */
+  if (!conn->addr)
+    return -1;
+
+  tor_assert(conn->addr); 
 
   return router_compare_addr_to_exit_policy(conn->addr, conn->port,
                    desc_routerinfo->exit_policy);