tor

The Tor anonymity network
git clone https://git.dasho.dev/tor.git
Log | Files | Refs | README | LICENSE

commit d8a4558532aa8157a52c88f7f2b468fa9d41e43e
parent 9d238778c7c034d7ed68aa9a642de0dd1d7e79cc
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed, 12 Nov 2025 14:05:50 -0500

conflux: Avoid tor_assert() when logging conflux set

The conflux_log_set() can be called on closed circuit which means the conflux
object is NULL.

Signed-off-by: David Goulet <dgoulet@torproject.org>

Diffstat:
Msrc/core/or/conflux_pool.c | 5++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c @@ -2113,7 +2113,10 @@ conflux_pool_init(void) void conflux_log_set(int loglevel, const conflux_t *cfx, bool is_client) { - tor_assert(cfx); + /* This could be called on a closed circuit. */ + if (cfx == NULL) { + return; + } log_fn(loglevel, LD_BUG,