[tor-commits] [tor/release-0.2.6] testing_common.c: avoid side-effects of tor_assert

[nickm@xxxxxxxxxxxxxx]

commit d39ede7f202b931506c1126b63665eaed4676abf
Author: Tom van der Woerdt <info@xxxxxxx>
Date:   Sun Mar 8 19:20:56 2015 +0100

    testing_common.c: avoid side-effects of tor_assert
---
 src/test/testing_common.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index d7d6dac..403c83b 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -165,18 +165,21 @@ static crypto_pk_t *pregen_keys[5] = {NULL, NULL, NULL, NULL, NULL};
 crypto_pk_t *
 pk_generate(int idx)
 {
+  int res;
 #ifdef CACHE_GENERATED_KEYS
   tor_assert(idx < N_PREGEN_KEYS);
   if (! pregen_keys[idx]) {
     pregen_keys[idx] = crypto_pk_new();
-    tor_assert(!crypto_pk_generate_key(pregen_keys[idx]));
+    res = crypto_pk_generate_key(pregen_keys[idx]);
+    tor_assert(!res);
   }
   return crypto_pk_dup_key(pregen_keys[idx]);
 #else
   crypto_pk_t *result;
   (void) idx;
   result = crypto_pk_new();
-  tor_assert(!crypto_pk_generate_key(result));
+  res = crypto_pk_generate_key(result);
+  tor_assert(!res);
   return result;
 #endif
 }



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits