From: Roger Dingledine <arma@torproject.org>
Date: Sat, 26 Mar 2005 06:27:51 +0000 (+0000)
Subject: move the assert higher up so the error message makes more sense
X-Git-Tag: tor-0.1.0.1-rc~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4533a46e41c7660a9c51ddc7c6dc8ca6a0233a22;p=thirdparty%2Ftor.git

move the assert higher up so the error message makes more sense
next time.


svn:r3887
---

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;