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 | cf3f7753c3f85cdb77b5602fbc29970177defa01 (patch) | |
| tree | ded412d0ae214dd8d8ce80ac41d5327f654dbffe | |
| parent | 9c2b114b2ee93434106ae300e31ba2ed317baea2 (diff) | |
| parent | e82023d2f7b75f9ff8c4bf1ddb3c4e251142d3ab (diff) | |
| download | tor-cf3f7753c3f85cdb77b5602fbc29970177defa01.tar.gz tor-cf3f7753c3f85cdb77b5602fbc29970177defa01.zip | |
Merge branch 'maint-0.3.5'
| -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 b67c9fae53..4cd50463d4 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -2832,13 +2832,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); |