1 files changed, 18 insertions, 32 deletions

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index e0cb64486..2c949def0 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -451,18 +451,15 @@ circuit_free(circuit_t *circ)
     memlen = sizeof(origin_circuit_t);
     tor_assert(circ->magic == ORIGIN_CIRCUIT_MAGIC);
     if (ocirc->build_state) {
-      if (ocirc->build_state->chosen_exit)
         extend_info_free(ocirc->build_state->chosen_exit);
-      if (ocirc->build_state->pending_final_cpath)
         circuit_free_cpath_node(ocirc->build_state->pending_final_cpath);
     }
     tor_free(ocirc->build_state);
 
     circuit_free_cpath(ocirc->cpath);
-    if (ocirc->intro_key)
-      crypto_free_pk_env(ocirc->intro_key);
-    if (ocirc->rend_data)
-      rend_data_free(ocirc->rend_data);
+
+    crypto_free_pk_env(ocirc->intro_key);
+    rend_data_free(ocirc->rend_data);
   } else {
     or_circuit_t *ocirc = TO_OR_CIRCUIT(circ);
     /* Remember cell statistics for this circuit before deallocating. */
@@ -472,14 +469,10 @@ circuit_free(circuit_t *circ)
     memlen = sizeof(or_circuit_t);
     tor_assert(circ->magic == OR_CIRCUIT_MAGIC);
 
-    if (ocirc->p_crypto)
-      crypto_free_cipher_env(ocirc->p_crypto);
-    if (ocirc->p_digest)
-      crypto_free_digest_env(ocirc->p_digest);
-    if (ocirc->n_crypto)
-      crypto_free_cipher_env(ocirc->n_crypto);
-    if (ocirc->n_digest)
-      crypto_free_digest_env(ocirc->n_digest);
+    crypto_free_cipher_env(ocirc->p_crypto);
+    crypto_free_digest_env(ocirc->p_digest);
+    crypto_free_cipher_env(ocirc->n_crypto);
+    crypto_free_digest_env(ocirc->n_digest);
 
     if (ocirc->rend_splice) {
       or_circuit_t *other = ocirc->rend_splice;
@@ -495,8 +488,7 @@ circuit_free(circuit_t *circ)
     cell_queue_clear(&ocirc->p_conn_cells);
   }
 
-  if (circ->n_hop)
-    extend_info_free(circ->n_hop);
+  extend_info_free(circ->n_hop);
   tor_free(circ->n_conn_onionskin);
 
   /* Remove from map. */
@@ -549,10 +541,10 @@ circuit_free_all(void)
     circuit_free(global_circuitlist);
     global_circuitlist = next;
   }
-  if (circuits_pending_or_conns) {
-    smartlist_free(circuits_pending_or_conns);
-    circuits_pending_or_conns = NULL;
-  }
+
+  smartlist_free(circuits_pending_or_conns);
+  circuits_pending_or_conns = NULL;
+
   HT_CLEAR(orconn_circid_map, &orconn_circid_circuit_map);
 }
 
@@ -563,18 +555,12 @@ circuit_free_cpath_node(crypt_path_t *victim)
   if (!victim)
     return;
 
-  if (victim->f_crypto)
-    crypto_free_cipher_env(victim->f_crypto);
-  if (victim->b_crypto)
-    crypto_free_cipher_env(victim->b_crypto);
-  if (victim->f_digest)
-    crypto_free_digest_env(victim->f_digest);
-  if (victim->b_digest)
-    crypto_free_digest_env(victim->b_digest);
-  if (victim->dh_handshake_state)
-    crypto_dh_free(victim->dh_handshake_state);
-  if (victim->extend_info)
-    extend_info_free(victim->extend_info);
+  crypto_free_cipher_env(victim->f_crypto);
+  crypto_free_cipher_env(victim->b_crypto);
+  crypto_free_digest_env(victim->f_digest);
+  crypto_free_digest_env(victim->b_digest);
+  crypto_dh_free(victim->dh_handshake_state);
+  extend_info_free(victim->extend_info);
 
   memset(victim, 0xBB, sizeof(crypt_path_t)); /* poison memory */
   tor_free(victim);