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
commitcc6fe187805a2bac8d0d70eb8de356c8e1422061 (patch)
tree2e52ffe18b5a6c21fe4a260ba700d946b47d081a
parent833be765131eab887017c0a869a07905852dcddc (diff)
downloadtor-cc6fe187805a2bac8d0d70eb8de356c8e1422061.tar.gz
tor-cc6fe187805a2bac8d0d70eb8de356c8e1422061.zip
Fix another segfault in assert_circuit_ok.
svn:r6818
-rw-r--r--trunk/src/or/circuitlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/trunk/src/or/circuitlist.c b/trunk/src/or/circuitlist.c
index 69e611dd98..dd9d7c2107 100644
--- a/trunk/src/or/circuitlist.c
+++ b/trunk/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) {