tor

commit 3313444ef08b891d344b1965a7776260c02f27ab
parent 6c966b894c2115d18ad5aecc7d02e7b96fea1daf
Author: teor <teor@torproject.org>
Date:   Thu, 28 Feb 2019 10:45:30 +1000

Merge branch 'maint-0.2.9' into maint-0.3.3

Diffstat:
A
changes/bug29599
 | 
3
+++
M
src/test/test_shared_random.c
 | 
5
+++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changes/bug29599 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
@@ -686,8 +686,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"
@@ -921,6 +921,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
@@ -1186,7 +1187,7 @@ test_state_transition(void *arg)
   }
 
  done:
-  return;
+  sr_state_free();
 }
 
 static void