[or-cvs] Fix another segfault in assert_circuit_ok.

Nick Mathewson nickm at seul.org
Sun Jul 23 08:13:47 UTC 2006


Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv1810/src/or

Modified Files:
	circuitlist.c 
Log Message:
Fix another segfault in assert_circuit_ok.

Index: circuitlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitlist.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -d -r1.94 -r1.95
--- circuitlist.c	23 Jul 2006 07:37:35 -0000	1.94
+++ circuitlist.c	23 Jul 2006 08:13:45 -0000	1.95
@@ -1014,7 +1014,7 @@ assert_circuit_ok(const circuit_t *c)
     tor_assert(!circuits_pending_or_conns ||
                !smartlist_isin(circuits_pending_or_conns, c));
   }
-  if (origin_circ->cpath) {
+  if (origin_circ && origin_circ->cpath) {
     assert_cpath_ok(origin_circ->cpath);
   }
   if (c->purpose == CIRCUIT_PURPOSE_REND_ESTABLISHED) {



More information about the tor-commits mailing list