diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:06:16 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:06:16 -0400 |
commit | 7a47379f252b4d277df7c289f8a9d3160b50eee0 (patch) | |
tree | 63d98a1f18fdb3cc1807d95ecea0277df59d4be3 /src/or | |
parent | 1a5be3c5e76a9ce07c64499b6cb8a6bad9323113 (diff) | |
parent | f6b30a97a96837e012b296a43cc99018d96bcf13 (diff) | |
download | tor-7a47379f252b4d277df7c289f8a9d3160b50eee0.tar.gz tor-7a47379f252b4d277df7c289f8a9d3160b50eee0.zip |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/directory.c | 1 | ||||
-rw-r--r-- | src/or/hs_descriptor.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 763666d2fa..6b8885e121 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3703,6 +3703,7 @@ client_likes_consensus(const struct consensus_cache_entry_t *ent, int have = 0; if (consensus_cache_entry_get_voter_id_digests(ent, voters) != 0) { + smartlist_free(voters); return 1; // We don't know the voters; assume the client won't mind. */ } diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index db88cdc4a4..8971ec59f3 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1129,6 +1129,7 @@ decode_link_specifiers(const char *encoded) sizeof(hs_spec->u.ed25519_id)); break; default: + tor_free(hs_spec); goto err; } |