]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Remove unnecessary non-fatal assertion.
authorAlexander Færøy <ahf@torproject.org>
Tue, 19 Jan 2021 16:59:13 +0000 (16:59 +0000)
committerAlexander Færøy <ahf@torproject.org>
Tue, 19 Jan 2021 17:08:01 +0000 (17:08 +0000)
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 [new file with mode: 0644]
src/core/or/circuitbuild.c

diff --git a/changes/bug32666 b/changes/bug32666
new file mode 100644 (file)
index 0000000..d487b22
--- /dev/null
@@ -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.
index ea32a5bc571a2740d700d35e309f6596195f8520..c0c918abe480dc0600974fcc3594a5482a8547ea 100644 (file)
@@ -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);
     }
   }