commit a4ca2ef1fffec0181b18f24a4aaaa71856108ce2 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 16 08:24:54 2015 -0500 Add some assertions to try to catch #17752 --- src/or/connection_edge.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 30dcd13..7a2de29 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -765,6 +765,7 @@ connection_ap_rescan_and_attach_pending(void) continue; entry_conn = TO_ENTRY_CONN(conn); + tor_assert(entry_conn); if (! smartlist_contains(pending_entry_connections, entry_conn)) { log_warn(LD_BUG, "Found a connection %p that was supposed to be " "in pending_entry_connections, but wasn't. No worries; " @@ -798,6 +799,7 @@ connection_ap_attach_pending(int retry) SMARTLIST_FOREACH_BEGIN(pending_entry_connections, entry_connection_t *, entry_conn) { connection_t *conn = ENTRY_TO_CONN(entry_conn); + tor_assert(conn && entry_conn); if (conn->marked_for_close) { SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); continue;