]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Downgrade assertion to nonfatal for #21242
authorNick Mathewson <nickm@torproject.org>
Tue, 31 Jan 2017 16:35:57 +0000 (11:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 31 Jan 2017 16:35:57 +0000 (11:35 -0500)
This assertion triggered in the (error) case where we got a result
from guards_choose_guard() without a descriptor.  That's not
supposed to be possible, but it's not worth crashing over.

src/or/circuitbuild.c

index f11c865ad0d73debfa9be63cf79ee11fcc43bdd7..88445f9248b2f3c287e026f0f515f310763ca367 100644 (file)
@@ -2369,7 +2369,7 @@ onion_extend_cpath(origin_circuit_t *circ)
       int client = (server_mode(get_options()) == 0);
       info = extend_info_from_node(r, client);
       /* Clients can fail to find an allowed address */
-      tor_assert(info || client);
+      tor_assert_nonfatal(info || client);
     }
   } else {
     const node_t *r =