From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Nov 2016 18:36:10 +0000 (-0400)
Subject: Add assertion that cpath_layer==NULL on OR circ
X-Git-Tag: tor-0.3.0.1-alpha~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0b86e30d0d53e997872a9ece42242e8e14d45c8;p=thirdparty%2Ftor.git

Add assertion that cpath_layer==NULL on OR circ
---

diff --git a/src/or/relay.c b/src/or/relay.c
index f5e9a6bb8c..99750af975 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -615,6 +615,7 @@ relay_send_command_from_edge_(streamid_t stream_id, circuit_t *circ,
     cell.circ_id = circ->n_circ_id;
     cell_direction = CELL_DIRECTION_OUT;
   } else {
+    tor_assert(! cpath_layer);
     cell.circ_id = TO_OR_CIRCUIT(circ)->p_circ_id;
     cell_direction = CELL_DIRECTION_IN;
   }