aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-11-29 20:34:33 -0800
committerRobert Ransom <rransom.8774@gmail.com>2011-11-29 20:34:33 -0800
commit825f3d31b1f1ec57b7321f9e05a8d027cb777c6a (patch)
tree35a9a9243e66c2ebb306ff95b057c844b15288c4 /src/or/relay.c
parent628b735fe39e13cc37afb567b32d4b006da51c89 (diff)
downloadtor-825f3d31b1f1ec57b7321f9e05a8d027cb777c6a.tar
tor-825f3d31b1f1ec57b7321f9e05a8d027cb777c6a.tar.gz
Add an assert before dereferencing entry_conn->socks_request
This may turn a segfault which katmagic saw into an assertion failure.
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index ac3114bda..6cf4b73a5 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -924,6 +924,7 @@ connection_edge_process_relay_cell_not_open(
}
circuit_log_path(LOG_INFO,LD_APP,TO_ORIGIN_CIRCUIT(circ));
/* don't send a socks reply to transparent conns */
+ tor_assert(entry_conn->socks_request != NULL);
if (!entry_conn->socks_request->has_finished)
connection_ap_handshake_socks_reply(entry_conn, NULL, 0, 0);