summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-04-28 01:48:25 +0200
committerSebastian Hahn <sebastian@torproject.org>2011-04-28 18:14:50 +0200
commit8a36f2125137dc31a0771a8eeac0f2bb8c1343d0 (patch)
treee58631c7739b543e47dce031b7c5d87a4ed3f30a
parentf1cf9bd74d225e90ca123eb664c1c5538eedaa03 (diff)
downloadtor-8a36f2125137dc31a0771a8eeac0f2bb8c1343d0.tar.gz
tor-8a36f2125137dc31a0771a8eeac0f2bb8c1343d0.zip
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.
-rw-r--r--src/or/circuituse.c1
1 files changed, 1 insertions, 0 deletions
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;
}
}
}