Fix an assertion failure on double-marked circuits, and a double-mark.

svn:r17179

1 files changed, 13 insertions, 5 deletions

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 9dbec897c..6d183fb9b 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1208,13 +1208,21 @@ assert_circuit_ok(const circuit_t *c)
   if (c->n_conn) {
     tor_assert(!c->n_hop);
 
-    if (c->n_circ_id)
-      tor_assert(c == circuit_get_by_circid_orconn(c->n_circ_id, c->n_conn));
+    if (c->n_circ_id) {
+      /* We use the _impl variant here to make sure we don't fail on marked
+       * circuits, which would not be returned by the regular function. */
+      circuit_t *c2 = circuit_get_by_circid_orconn_impl(c->n_circ_id,
+                                                        c->n_conn);
+      tor_assert(c == c2);
+    }
   }
   if (or_circ && or_circ->p_conn) {
-    if (or_circ->p_circ_id)
-      tor_assert(c == circuit_get_by_circid_orconn(or_circ->p_circ_id,
-                                                   or_circ->p_conn));
+    if (or_circ->p_circ_id) {
+      /* ibid */
+      circuit_t *c2 = circuit_get_by_circid_orconn_impl(or_circ->p_circ_id,
+                                                        or_circ->p_conn);
+      tor_assert(c == c2);
+    }
   }
 #if 0 /* false now that rendezvous exits are attached to p_streams */
   if (origin_circ)