summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-03-26 06:27:51 +0000
committerRoger Dingledine <arma@torproject.org>2005-03-26 06:27:51 +0000
commit4533a46e41c7660a9c51ddc7c6dc8ca6a0233a22 (patch)
tree720a57157218c0b08487c8b92bbc3a3159e3158a
parentfcfe6d2e8bc7de246bbd801e3258b9ca7fda4002 (diff)
downloadtor-4533a46e41c7660a9c51ddc7c6dc8ca6a0233a22.tar.gz
tor-4533a46e41c7660a9c51ddc7c6dc8ca6a0233a22.zip
move the assert higher up so the error message makes more sense
next time. svn:r3887
-rw-r--r--src/or/connection_edge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 019cdca023..fadb53c268 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1218,11 +1218,11 @@ void connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
size_t replylen,
socks5_reply_status_t status) {
char buf[256];
+ tor_assert(conn->socks_request); /* make sure it's an AP stream */
control_event_stream_status(conn,
status==SOCKS5_SUCCEEDED ? STREAM_EVENT_SUCCEEDED : STREAM_EVENT_FAILED);
- tor_assert(conn->socks_request);
if (conn->socks_request->has_finished) {
log_fn(LOG_WARN, "Harmless bug: duplicate calls to connection_ap_handshake_socks_reply.");
return;