From d39ede7f202b931506c1126b63665eaed4676abf Mon Sep 17 00:00:00 2001 From: Tom van der Woerdt Date: Sun, 8 Mar 2015 19:20:56 +0100 Subject: [PATCH 1/2] 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 d7d6dacee6..403c83bdd2 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 } From 42d877f0847f5541108328c52fb671740b888a18 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 9 Mar 2015 11:13:57 -0400 Subject: [PATCH 2/2] Changes file for 15188 --- changes/15188 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changes/15188 diff --git a/changes/15188 b/changes/15188 new file mode 100644 index 0000000000..2065b3974c --- /dev/null +++ b/changes/15188 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Avoid a side-effect in a tor_assert() in the unit tests. Fixes bug + 15188; bugfix on 0.1.2.3-alpha. Patch from Tom van der Woerdt.