From: Sebastian Hahn <sebastian@torproject.org>
Date: Wed, 27 Apr 2011 23:48:25 +0000 (+0200)
Subject: Fix a failure case of connection_ap_handshake_attach_circuit()
X-Git-Tag: tor-0.2.1.31~19^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a36f2125137dc31a0771a8eeac0f2bb8c1343d0;p=thirdparty%2Ftor.git

Fix a failure case of connection_ap_handshake_attach_circuit()

tor_fragile_assert() might be a no-op, so we have to return something
here to indicate failure to the caller.
---

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 247aca7e07..6a9c3975c2 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1573,6 +1573,7 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn)
           return -1;
         default: /* oops */
           tor_fragile_assert();
+          return -1;
         }
       }
     }