aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-16 08:24:54 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-16 08:24:54 -0500
commita4ca2ef1fffec0181b18f24a4aaaa71856108ce2 (patch)
tree3b0c005e59d5a5a9057df556a4bda337917e6caf
parentc4df0c9f52cfeee414c7316073c92975ebd81c85 (diff)
downloadtor-a4ca2ef1fffec0181b18f24a4aaaa71856108ce2.tar.gz
tor-a4ca2ef1fffec0181b18f24a4aaaa71856108ce2.zip
Add some assertions to try to catch #17752
-rw-r--r--src/or/connection_edge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 30dcd13f4a..7a2de29601 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;