[or-cvs] fix another segv, this time in circid fix.
Nick Mathewson
nickm at seul.org
Tue Oct 25 15:31:27 UTC 2005
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv16897/src/or
Modified Files:
circuitlist.c
Log Message:
fix another segv, this time in circid fix.
Index: circuitlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitlist.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- circuitlist.c 25 Oct 2005 07:05:03 -0000 1.65
+++ circuitlist.c 25 Oct 2005 15:31:25 -0000 1.66
@@ -394,7 +394,7 @@
circuit_get_by_circid_orconn(uint16_t circ_id, connection_t *conn)
{
circuit_t *circ = circuit_get_by_circid_orconn_impl(circ_id, conn);
- if (circ->marked_for_close)
+ if (!circ || circ->marked_for_close)
return NULL;
else
return circ;
More information about the tor-commits
mailing list