From 4d9eb4dd0e67190f8e3bf5300e85611d8605400c Mon Sep 17 00:00:00 2001 From: teor Date: Tue, 26 Feb 2019 22:14:30 +1000 Subject: [PATCH 1/2] test/shared-random: Stop leaking shared random state in the unit tests Stop leaking parts of the shared random state in the shared-random unit tests. Fixes bug 29599; bugfix on 0.2.9.1-alpha. --- changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changes/bug29599 diff --git a/changes/bug29599 b/changes/bug29599 new file mode 100644 index 0000000000..14e2f5d077 --- /dev/null +++ b/changes/bug29599 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory management, testing): + - Stop leaking parts of the shared random state in the shared-random unit + tests. Fixes bug 29599; bugfix on 0.2.9.1-alpha. diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 6a8c1abaff..cebe772d94 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -594,8 +594,8 @@ test_vote(void *arg) } done: - sr_commit_free(our_commit); UNMOCK(trusteddirserver_get_by_v3_auth_digest); + sr_state_free(); } static const char *sr_state_str = "Version 1\n" @@ -829,6 +829,7 @@ test_sr_compute_srv(void *arg) done: UNMOCK(trusteddirserver_get_by_v3_auth_digest); + sr_state_free(); } /** Return a minimal vote document with a current SRV value set to @@ -1094,7 +1095,7 @@ test_state_transition(void *arg) } done: - return; + sr_state_free(); } static void From d4b7975ce70fc93671136445c95c2009408cfe70 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 27 Feb 2019 14:57:35 +1000 Subject: [PATCH 2/2] test/shared-random: use sr_state_free_all() rather than sr_state_free() sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3. Part of 29599. --- src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 2283976415..2f762dc90c 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -687,7 +687,7 @@ test_vote(void *arg) done: UNMOCK(trusteddirserver_get_by_v3_auth_digest); - sr_state_free(); + sr_state_free_all(); } static const char *sr_state_str = "Version 1\n" @@ -921,7 +921,7 @@ test_sr_compute_srv(void *arg) done: UNMOCK(trusteddirserver_get_by_v3_auth_digest); - sr_state_free(); + sr_state_free_all(); } /** Return a minimal vote document with a current SRV value set to @@ -1187,7 +1187,7 @@ test_state_transition(void *arg) } done: - sr_state_free(); + sr_state_free_all(); } static void