diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-10-16 22:14:52 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-10-16 22:14:52 +0000 |
| commit | de65052312ff9ddd86e492985008bd5ca61d7aa9 (patch) | |
| tree | 96a2b81c47b4e35e465aa01d8328517a1525d752 /src/or/rendclient.c | |
| parent | 25a046df7422560b16dfdb302df9621309d5fa77 (diff) | |
| download | tor-de65052312ff9ddd86e492985008bd5ca61d7aa9.tar tor-de65052312ff9ddd86e492985008bd5ca61d7aa9.tar.gz | |
don't assert multiple things in the same tor_assert()
svn:r2544
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 70f0564a5..e6a990bd2 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -15,7 +15,8 @@ void rend_client_introcirc_has_opened(circuit_t *circ) { tor_assert(circ->purpose == CIRCUIT_PURPOSE_C_INTRODUCING); - tor_assert(CIRCUIT_IS_ORIGIN(circ) && circ->cpath); + tor_assert(CIRCUIT_IS_ORIGIN(circ)); + tor_assert(circ->cpath); log_fn(LOG_INFO,"introcirc is open"); connection_ap_attach_pending(); @@ -315,7 +316,8 @@ rend_client_receive_rendezvous(circuit_t *circ, const char *request, size_t requ } /* first DH_KEY_LEN bytes are g^y from bob. Finish the dh handshake...*/ - tor_assert(circ->build_state && circ->build_state->pending_final_cpath); + tor_assert(circ->build_state); + tor_assert(circ->build_state->pending_final_cpath); hop = circ->build_state->pending_final_cpath; tor_assert(hop->handshake_state); if (crypto_dh_compute_secret(hop->handshake_state, request, DH_KEY_LEN, |