diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-01 11:15:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-01 11:15:09 -0500 |
| commit | 92fb9f9342923891ce34eff0448406842e232532 (patch) | |
| tree | b1441cbd01766f58ba46347a4223bbbc005967ee | |
| parent | 84b2197571b847b9100b300ee596f371547b0301 (diff) | |
| parent | e3a19b1c788ba303a41cab0dcba945af84041764 (diff) | |
| download | tor-92fb9f9342923891ce34eff0448406842e232532.tar.gz tor-92fb9f9342923891ce34eff0448406842e232532.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -rw-r--r-- | changes/bug28554 | 3 | ||||
| -rw-r--r-- | src/test/test_entrynodes.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug28554 b/changes/bug28554 new file mode 100644 index 0000000000..9a0b281406 --- /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 d8bd8e328b..e0162e3058 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -2819,13 +2819,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); |