Merge branch 'maint-0.3.4' into maint-0.3.5

torproject · Feb 28, 2019 · be29dfe · be29dfe
2 parents 15dc338 + 5247315
commit be29dfe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -733,8 +733,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"
@@ -968,6 +968,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
@@ -1233,7 +1234,7 @@ test_state_transition(void *arg)
   }
 
  done:
-  return;
+  sr_state_free();
 }
 
 static void