[or-cvs] minimal backport: remove an assert that might cause trouble...

arma at seul.org arma at seul.org
Mon Jul 17 06:55:52 UTC 2006


Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-011x/tor/src/or

Modified Files:
      Tag: tor-0_1_1-patches
	circuitbuild.c 
Log Message:
minimal backport: remove an assert that might cause trouble one day.


Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.230.2.8
retrieving revision 1.230.2.9
diff -u -p -d -r1.230.2.8 -r1.230.2.9
--- circuitbuild.c	4 Jul 2006 17:10:12 -0000	1.230.2.8
+++ circuitbuild.c	17 Jul 2006 06:55:50 -0000	1.230.2.9
@@ -182,7 +182,8 @@ circuit_rep_hist_note_result(circuit_t *
   }
   if (server_mode(get_options())) {
     routerinfo_t *me = router_get_my_routerinfo();
-    tor_assert(me);
+    if (!me)
+      return;
     prev_digest = me->cache_info.identity_digest;
   }
   do {



More information about the tor-commits mailing list