From: Roger Dingledine <arma@torproject.org>
Date: Thu, 30 Sep 2004 15:40:05 +0000 (+0000)
Subject: Fix a rare assert trigger, where routerinfos for entries in our cpath
X-Git-Tag: tor-0.0.9pre1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eff780c815d1f5ffdc25cf15db7282e6e7f61e8c;p=thirdparty%2Ftor.git

Fix a rare assert trigger, where routerinfos for entries in our cpath
would expire while we're building the path.
Thanks to Eugene Armstead for pointing it out.


svn:r2402
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 7acb876bc5..eb4764d156 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1083,10 +1083,10 @@ static routerinfo_t *choose_good_middle_server(cpath_build_state_t *state,
     routerlist_add_friends(excluded, r);
   }
   for (i = 0, cpath = head; i < cur_len; ++i, cpath=cpath->next) {
-    r = router_get_by_digest(cpath->identity_digest);
-    tor_assert(r);
-    smartlist_add(excluded, r);
-    routerlist_add_friends(excluded, r);
+    if((r = router_get_by_digest(cpath->identity_digest))) {
+      smartlist_add(excluded, r);
+      routerlist_add_friends(excluded, r);
+    }
   }
   choice = router_choose_random_node("", options.ExcludeNodes, excluded,
            0, 1, options._AllowUnverified & ALLOW_UNVERIFIED_MIDDLE, 0);