commit ffc7b81b5dd909f0c4325e7a5b893504f76b9c77
Author: teor <teor(a)torproject.org>
Date: Wed Nov 21 15:56:30 2018 +1000
Test: Fix memory leaks and missing unmocks in entry guard tests
test_entry_guard_outdated_dirserver_exclusion leaks memory, and is
missing some unmocks.
Fixes 28554; bugfix on 0.3.0.1-alpha.
---
changes/bug28554 | 3 +++
src/test/test_entrynodes.c | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/bug28554 b/changes/bug28554
new file mode 100644
index 000000000..9a0b28140
--- /dev/null
+++ b/changes/bug28554
@@ -0,0 +1,3 @@
+ o Minor bugfixes (unit tests, guard selection):
+ - Stop leaking memory in an entry guard unit test. Fixes bug 28554;
+ bugfix on 0.3.0.1-alpha.
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 505e09e36..3b54ffa2e 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -2779,13 +2779,16 @@ test_entry_guard_outdated_dirserver_exclusion(void *arg)
digests, 3, 7, 0);
/* ... and check that because we failed to fetch microdescs from all our
- * primaries, we didnt end up selecting a primary for fetching dir info */
+ * primaries, we didn't end up selecting a primary for fetching dir info */
expect_log_msg_containing("No primary or confirmed guards available.");
teardown_capture_of_logs();
}
done:
+ UNMOCK(networkstatus_get_latest_consensus_by_flavor);
+ UNMOCK(directory_initiate_request);
smartlist_free(digests);
+ tor_free(mock_ns_val);
tor_free(args);
if (conn) {
tor_free(conn->requested_resource);