[or-cvs] backport from pre3:

Roger Dingledine arma at seul.org
Wed Oct 13 21:56:37 UTC 2004


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

Modified Files:
      Tag: tor-0_0_8-patches
	circuituse.c 
Log Message:
backport from pre3:
fix a stale pointer assert bug when a stream detaches and reattaches


Index: circuituse.c
===================================================================
RCS file: /home2/or/cvsroot/src/or/circuituse.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- circuituse.c	18 Aug 2004 20:34:43 -0000	1.11
+++ circuituse.c	13 Oct 2004 21:56:35 -0000	1.11.2.1
@@ -334,6 +334,8 @@
 
   tor_assert(circ && conn);
 
+  conn->cpath_layer = NULL; /* make sure we don't keep a stale pointer */
+
   if(conn == circ->p_streams) {
     circ->p_streams = conn->next_stream;
     return;



More information about the tor-commits mailing list