nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check magic number in connection_ap_attach_pending

Browse Source
This commit is contained in:
Nick Mathewson 2015-11-27 11:21:51 -05:00
parent 0c7bfb206e
commit 5665775e8c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/connection_edge.c
View File

@ -799,6 +799,12 @@ connection_ap_attach_pending(int retry)
SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn);
continue; 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) { if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) {
log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state " log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state "
"is %s. Why is it on pending_entry_connections?", "is %s. Why is it on pending_entry_connections?",