From: Roger Dingledine <arma@torproject.org>
Date: Sat, 19 Apr 2003 00:24:17 +0000 (+0000)
Subject: bugfix: don't segfault if there's no valid circuit open
X-Git-Tag: tor-0.0.2pre8~215
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffae44aafd4ea988d8ae7d72fdad350e953c165a;p=thirdparty%2Ftor.git

bugfix: don't segfault if there's no valid circuit open


svn:r253
---

diff --git a/src/or/connection_ap.c b/src/or/connection_ap.c
index 7dfa1ccc51..c9e99d5bc5 100644
--- a/src/or/connection_ap.c
+++ b/src/or/connection_ap.c
@@ -95,15 +95,14 @@ int ap_handshake_process_socks(connection_t *conn) {
 
   /* find the circuit that we should use, if there is one. */
   circ = circuit_get_newest_by_edge_type(EDGE_AP);
-  circ->dirty = 1;
-
-  /* now we're all ready to make an onion or send a begin */
 
   if(!circ) {
     log(LOG_INFO,"ap_handshake_process_socks(): No circuit ready. Closing.");
     return -1;
   }
 
+  circ->dirty = 1;
+
   /* add it into the linked list of topics on this circuit */
   log(LOG_DEBUG,"ap_handshake_process_socks(): attaching new conn to circ. n_aci %d.", circ->n_aci);
   conn->next_topic = circ->p_conn;