commit befb32082348dfbe5ac21035cedf0ce968e8534b parent c2d558b955def24acd6150145fc1d3091f7ab3a3 Author: David Goulet <dgoulet@torproject.org> Date: Tue, 16 Sep 2025 08:58:22 -0400 Merge branch 'tor-gitlab/mr/927' into maint-0.4.8 Diffstat:
| M | changes/ticket41037 | | | 3 | +++ |
| M | src/core/or/conflux_pool.c | | | 5 | +++++ |
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/ticket41037 b/changes/ticket41037 @@ -1,3 +1,6 @@ o Minor bugfix (conflux): - Avoid a non fatal assert when describing a conflux circuit on the control port after being prepped to be freed. Fixes bug 41037; bugfix on 0.4.8.15. + - Remove the pending nonce if we realize that the nonce of the unlinked + circuit is not tracked anymore. Should avoid the non fatal assert + triggered with a control port circuit event. diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c @@ -1460,6 +1460,11 @@ unlinked_circuit_closed(circuit_t *circ) /* This circuit is part of set that has already been removed previously freed * by another leg closing. */ if (!unlinked) { + /* This circuit is not Conflux related anymore regardless of its purpose so + * remove the pending nonce so after this function, the circuit is not + * considered conflux with CIRCUIT_IS_CONFLUX(). */ + tor_free(circ->conflux_pending_nonce); + circ->conflux_pending_nonce = NULL; return; }