diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:06:15 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:06:15 -0400 |
commit | f6b30a97a96837e012b296a43cc99018d96bcf13 (patch) | |
tree | c54975bf9670ab98e42c5f917afc075f72846aa8 /src/or | |
parent | 5ab23e03fa0a8bce11798cbf025139e9653b9be4 (diff) | |
parent | f82f8179e65c5e0021da46fd24e4bd7d8126d8f7 (diff) | |
download | tor-f6b30a97a96837e012b296a43cc99018d96bcf13.tar.gz tor-f6b30a97a96837e012b296a43cc99018d96bcf13.zip |
Merge branch 'maint-0.3.3' into 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 c7da804909..e763de268f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3684,6 +3684,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 096122392d..7ffa885ca8 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1127,6 +1127,7 @@ decode_link_specifiers(const char *encoded) sizeof(hs_spec->u.ed25519_id)); break; default: + tor_free(hs_spec); goto err; } |