[or-cvs] r17986: {tor} no actual changes besides a seg fault on startup, i meant (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2009-01-06 16:42:05 -0500 (Tue, 06 Jan 2009)
New Revision: 17986

Modified:
   tor/trunk/src/or/circuituse.c
Log:
no actual changes besides a seg fault on startup, i meant


Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2009-01-06 21:31:46 UTC (rev 17985)
+++ tor/trunk/src/or/circuituse.c	2009-01-06 21:42:05 UTC (rev 17986)
@@ -810,10 +810,13 @@
                n_conn->_base.address, n_conn->_base.port);
       n_conn->is_bad_for_new_circs = 1;
     }
-    entry_guard_register_connect_status(n_conn_id, 0, time(NULL));
-    /* if there are any one-hop streams waiting on this circuit, fail
-     * them now so they can retry elsewhere. */
-    connection_ap_fail_onehop(n_conn_id, circ->build_state);
+    if (circ->_base.n_hop) {
+      const char *n_conn_id = circ->_base.n_hop->identity_digest;
+      entry_guard_register_connect_status(n_conn_id, 0, time(NULL));
+      /* if there are any one-hop streams waiting on this circuit, fail
+       * them now so they can retry elsewhere. */
+      connection_ap_fail_onehop(n_conn_id, circ->build_state);
+    }
   }
 
   switch (circ->_base.purpose) {