[tor-commits] [tor/maint-0.2.2] Fix a failure case of connection_ap_handshake_attach_circuit()

[nickm at torproject.org]

commit 8a36f2125137dc31a0771a8eeac0f2bb8c1343d0
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Apr 28 01:48:25 2011 +0200

    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.
---
 src/or/circuituse.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 247aca7..6a9c397 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;
         }
       }
     }