[or-cvs] fix a seg fault when you try to launch a circ

Roger Dingledine arma at seul.org
Sat Jul 3 01:45:15 UTC 2004


Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	circuitlist.c 
Log Message:
fix a seg fault when you try to launch a circ


Index: circuitlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuitlist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- circuitlist.c	2 Jul 2004 23:40:03 -0000	1.8
+++ circuitlist.c	3 Jul 2004 01:45:13 -0000	1.9
@@ -452,10 +452,10 @@
   tor_assert(c->purpose >= _CIRCUIT_PURPOSE_MIN &&
              c->purpose <= _CIRCUIT_PURPOSE_MAX);
 
-  if (c->n_conn)
+  if (c->n_conn) {
     tor_assert(c->n_conn->type == CONN_TYPE_OR);
-    /* XXX008 have to memcpy id_digest when we attach n_conn */
     tor_assert(!memcmp(c->n_conn->identity_digest, c->n_conn_id_digest, DIGEST_LEN));
+  }
   if (c->p_conn)
     tor_assert(c->p_conn->type == CONN_TYPE_OR);
   for (conn = c->p_streams; conn; conn = conn->next_stream)



More information about the tor-commits mailing list