From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Nov 2003 03:01:38 +0000 (+0000)
Subject: Fix thinko: Failure and success are different things.
X-Git-Tag: tor-0.0.2pre14~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0ad4d08be4a6096455ffbf76965256dab85ccc3;p=thirdparty%2Ftor.git

Fix thinko: Failure and success are different things.


svn:r795
---

diff --git a/src/or/circuit.c b/src/or/circuit.c
index 206742e659..970cc410fc 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -758,7 +758,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
     assert(circ->state == CIRCUIT_STATE_BUILDING);
     log_fn(LOG_DEBUG,"starting to send subsequent skin.");
     r = onion_extend_cpath(&circ->cpath, circ->desired_cpath_len, &router);
-    if (r==1 || !router) {
+    if (r==1) {
       /* done building the circuit. whew. */
       circ->state = CIRCUIT_STATE_OPEN;
       log_fn(LOG_INFO,"circuit built! (%d hops long)",circ->desired_cpath_len);
@@ -766,7 +766,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
        * circuit that one is ready. */
       connection_ap_attach_pending();
       return 0;
-    } else if (r<0) {
+    } else if (r<0 || !router) {
       log_fn(LOG_WARN,"Unable to extend circuit path.");
       return -1;
     }