aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/conflux.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2024-04-15 15:11:30 -0400
committerDavid Goulet <dgoulet@torproject.org>2024-04-15 15:11:30 -0400
commita93759b46e8f883182ac368bd55df5152695c2e5 (patch)
tree2c1722425080881ed4c0a7b8e8999c952dcdd8e6 /src/core/or/conflux.c
parent0bd1df58d0d6671bb0e386bcae2dd802b6eb7ef6 (diff)
parent29e3601c4249094e010c49e55e8bcd5769b4eb57 (diff)
downloadtor-a93759b46e8f883182ac368bd55df5152695c2e5.tar.gz
tor-a93759b46e8f883182ac368bd55df5152695c2e5.zip
Merge branch 'maint-0.4.8'
Diffstat (limited to 'src/core/or/conflux.c')
-rw-r--r--src/core/or/conflux.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/or/conflux.c b/src/core/or/conflux.c
index 677df95067..9025dcffaf 100644
--- a/src/core/or/conflux.c
+++ b/src/core/or/conflux.c
@@ -531,7 +531,10 @@ conflux_note_cell_sent(conflux_t *cfx, circuit_t *circ, uint8_t relay_command)
}
leg = conflux_get_leg(cfx, circ);
- tor_assert(leg);
+ if (leg == NULL) {
+ log_fn(LOG_PROTOCOL_WARN, LD_BUG, "No Conflux leg after sending a cell");
+ return;
+ }
leg->last_seq_sent++;