tor

commit dd25a8c7de4d680ae7333dd5d6863c10f20b2e54
parent 4a4aef4977231f14f2b91623760035ac458ee3e9
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 27 Mar 2025 15:56:02 -0400

Merge branch 'tor-gitlab/mr/874' into maint-0.4.8

Diffstat:
A
changes/ticket41037
 | 
3
+++
M
src/core/or/conflux_util.h
 | 
5
+++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changes/ticket41037 b/changes/ticket41037
@@ -0,0 +1,3 @@
+  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.
diff --git a/src/core/or/conflux_util.h b/src/core/or/conflux_util.h
@@ -28,8 +28,9 @@ CIRCUIT_IS_CONFLUX(const circuit_t *circ)
       tor_assert_nonfatal(circ->purpose == CIRCUIT_PURPOSE_CONFLUX_LINKED);
     return true;
   } else {
-    tor_assert_nonfatal(circ->purpose != CIRCUIT_PURPOSE_CONFLUX_LINKED);
-    tor_assert_nonfatal(circ->purpose != CIRCUIT_PURPOSE_CONFLUX_UNLINKED);
+    /* We don't assert on purposes here because we can end up in this branch
+     * with circ->conflux being NULL but for a conflux purpose. This happens in
+     * the about_to_free() code path. */
     return false;
   }
 }