aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-02-28 10:45:37 +1000
committerteor <teor@torproject.org>2019-02-28 10:45:37 +1000
commit6f3f8bb1e4d117ace4d6d8b77077f4a9d6b41ce6 (patch)
treeae77f4c499c7e05ecb4910d3c28a6b5d89b867bc
parent3ecfb68bd72a6842dd11709e30590271f70ae69f (diff)
parent3313444ef08b891d344b1965a7776260c02f27ab (diff)
downloadtor-6f3f8bb1e4d117ace4d6d8b77077f4a9d6b41ce6.tar.gz
tor-6f3f8bb1e4d117ace4d6d8b77077f4a9d6b41ce6.zip
Merge branch 'maint-0.3.3' into release-0.3.3
-rw-r--r--changes/bug295993
-rw-r--r--src/test/test_shared_random.c5
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 437fc38deb..2283976415 100644
--- 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