[tor-commits] [tor/master] Downgrade assertion to nonfatal for #21242

[nickm@xxxxxxxxxxxxxx]

commit 93b39c51629ed0ded2bf807cb6a06d59f3a55347
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jan 31 11:35:57 2017 -0500

    Downgrade assertion to nonfatal for #21242
    
    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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index f11c865..88445f9 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -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 =



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits