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 | f82f8179e65c5e0021da46fd24e4bd7d8126d8f7 (patch) | |
| tree | cc0c924b2eb5ff9644aef4022cdbb966f28c7509 /src/or | |
| parent | df896ed6323f6f0493393f97e739501df8092e7f (diff) | |
| parent | 68dfbd5ef433b830059baa08d48589518db05d22 (diff) | |
| download | tor-f82f8179e65c5e0021da46fd24e4bd7d8126d8f7.tar.gz tor-f82f8179e65c5e0021da46fd24e4bd7d8126d8f7.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
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 0004878cdb..8636f68410 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3680,6 +3680,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 52a58d926d..0298c37322 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1125,6 +1125,7 @@ decode_link_specifiers(const char *encoded) sizeof(hs_spec->u.ed25519_id)); break; default: + tor_free(hs_spec); goto err; } |