Commit 612b801e authored by David Goulet's avatar David Goulet 🐼
Browse files

conflux: Don't process a closed circuit on get packaged window 



Signed-off-by: David Goulet's avatarDavid Goulet <dgoulet@torproject.org>
parent 6ebf4360

changes/ticket40908

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/core/or/conflux_util.c

+7 −0
Original line number Diff line number Diff line
@@ -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 ==