From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 27 Nov 2015 16:21:51 +0000 (-0500)
Subject: Check magic number in connection_ap_attach_pending
X-Git-Tag: tor-0.2.8.1-alpha~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5665775e8c822d45282d1d56a01a0f5883c7b070;p=thirdparty%2Ftor.git

Check magic number in connection_ap_attach_pending
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 496fe21b11..8b2f635b23 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -799,6 +799,12 @@ connection_ap_attach_pending(int retry)
       SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn);
       continue;
     }
+    if (conn->magic != ENTRY_CONNECTION_MAGIC) {
+      log_warn(LD_BUG, "%p has impossible magic value %u",
+               entry_conn, (unsigned)conn->magic);
+      SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn);
+      continue;
+    }
     if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) {
       log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state "
                "is %s. Why is it on pending_entry_connections?",