commit 612b801ea53cd0b318e3bf88da5bb5de6b507226 parent 6ebf4360840b173b92fcdb14ce22bd326cea652f Author: David Goulet <dgoulet@torproject.org> Date: Mon, 15 Apr 2024 14:45:29 -0400 conflux: Don't process a closed circuit on get packaged window Signed-off-by: David Goulet <dgoulet@torproject.org> Diffstat:
| A | changes/ticket40908 | | | 5 | +++++ |
| M | src/core/or/conflux_util.c | | | 7 | +++++++ |
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/changes/ticket40908 b/changes/ticket40908 @@ -0,0 +1,5 @@ + o Minor bugfixes (conflux): + - Make sure we don't process a closed circuit when packaging data. This lead + to a non fatal BUG() spamming logs. Fixes bug 40908; bugfix on + 0.4.8.1-alpha. + diff --git a/src/core/or/conflux_util.c b/src/core/or/conflux_util.c @@ -33,6 +33,13 @@ int circuit_get_package_window(circuit_t *circ, const crypt_path_t *cpath) { + /* We believe it is possible to get a closed circuit related to the + * on_circuit pointer of a connection not being nullified before ending up + * here. Else, this can lead to loud bug like experienced in #40908. */ + if (circ->marked_for_close) { + return 0; + } + if (circ->conflux) { if (CIRCUIT_IS_ORIGIN(circ)) { tor_assert_nonfatal(circ->purpose ==