aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-10-25 15:31:25 +0000
committerNick Mathewson <nickm@torproject.org>2005-10-25 15:31:25 +0000
commita38aa81bf828694e1a98474e8df2627d1661b399 (patch)
treef9985d75608edff3be313ff8e88a6779ab159eea
parent9b6c5614c64ea0b76d0e3722dc438e31a06f0d85 (diff)
downloadtor-a38aa81bf828694e1a98474e8df2627d1661b399.tar
tor-a38aa81bf828694e1a98474e8df2627d1661b399.tar.gz
fix another segv, this time in circid fix.
svn:r5312
-rw-r--r--src/or/circuitlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 7f10ee6db..1996cccce 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -394,7 +394,7 @@ circuit_t *
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;