summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-07-23 08:13:45 +0000
committerNick Mathewson <nickm@torproject.org>2006-07-23 08:13:45 +0000
commitd27cbf5d4b7723e872f2d76372496b3d159e1b45 (patch)
tree5abe05dd28b0f751a51238df240ba48daa414936
parent7239262f71cfe829ff7c50b1d971534f0cda1dc4 (diff)
downloadtor-d27cbf5d4b7723e872f2d76372496b3d159e1b45.tar.gz
tor-d27cbf5d4b7723e872f2d76372496b3d159e1b45.zip
Fix another segfault in assert_circuit_ok.
svn:r6818
-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 69e611dd98..dd9d7c2107 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -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) {