commit 13cf96445377ba97090c759901d2574cdc82ca3c
Author: Alexander Færøy <ahf(a)torproject.org>
Date: Tue Jan 19 16:59:13 2021 +0000
Remove unnecessary non-fatal assertion.
This patch removes a call to `tor_assert_nonfatal()` if
`extend_info_from_node()` returns NULL. This is unnecessary as we
already handle the case where `info` is NULL in the next `if (!info) {
... }` block in the code.
See: tor#32666.
---
changes/bug32666 | 3 +++
src/core/or/circuitbuild.c | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/changes/bug32666 b/changes/bug32666
new file mode 100644
index 0000000000..d487b22148
--- /dev/null
+++ b/changes/bug32666
@@ -0,0 +1,3 @@
+ o Minor bugfixes (onion services):
+ - Avoid a non-fatal assertion in certain edge-cases when establishing a
+ circuit to onion service. Fixes bug 32666; bugfix on 0.3.0.3-alpha.
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index ea32a5bc57..c0c918abe4 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -2456,7 +2456,6 @@ onion_extend_cpath(origin_circuit_t *circ)
choose_good_middle_server(purpose, state, circ->cpath, cur_len);
if (r) {
info = extend_info_from_node(r, 0);
- tor_assert_nonfatal(info);
}
}