diff options
author | teor <teor@torproject.org> | 2019-02-28 10:45:52 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-02-28 10:45:52 +1000 |
commit | 5bbba3c9488c2184f822b270d6527a7ea898b16a (patch) | |
tree | 2d3033c5fa187855b4f298a14f04f3ba0b303fb1 | |
parent | 6a930b442c986af11a438dd25f3fd5002ec3879e (diff) | |
parent | 524731503e0a885ab2dbb778831aa79875f8edae (diff) | |
download | tor-5bbba3c9488c2184f822b270d6527a7ea898b16a.tar.gz tor-5bbba3c9488c2184f822b270d6527a7ea898b16a.zip |
Merge branch 'maint-0.3.4' into release-0.3.4
-rw-r--r-- | changes/bug29599 | 3 | ||||
-rw-r--r-- | src/test/test_shared_random.c | 5 |
2 files changed, 6 insertions, 2 deletions
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 2b3c8c93be..43ba0d9e53 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -689,8 +689,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" @@ -924,6 +924,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 @@ -1189,7 +1190,7 @@ test_state_transition(void *arg) } done: - return; + sr_state_free(); } static void |