tor

commit 419077c26da1e50ed5671c69ec446a3eb60a8303
parent 1385a5118d55edd3dd672eeb793b662853f30758
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 29 Jun 2018 13:06:08 -0400

Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1

Diffstat:
M
src/or/directory.c
 | 
1
+
M
src/test/hs_test_helpers.c
 | 
6
++++++
M
src/test/test_channelpadding.c
 | 
2
++

3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/or/directory.c b/src/or/directory.c
@@ -3499,6 +3499,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/test/hs_test_helpers.c b/src/test/hs_test_helpers.c
@@ -85,6 +85,9 @@ hs_helper_build_intro_point(const ed25519_keypair_t *signing_kp, time_t now,
 
   intro_point = ip;
  done:
+  if (intro_point == NULL)
+    tor_free(ip);
+
   return intro_point;
 }
 
@@ -139,6 +142,9 @@ hs_helper_build_hs_desc_impl(unsigned int no_ip,
 
   descp = desc;
  done:
+  if (descp == NULL)
+    tor_free(desc);
+
   return descp;
 }
 
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c
@@ -745,6 +745,8 @@ test_channelpadding_consensus(void *arg)
   tt_i64_op(val, OP_LE, 24*60*60*2);
 
  done:
+  tor_free(relay);
+
   free_mock_consensus();
   free_fake_channeltls((channel_tls_t*)chan);
   smartlist_free(connection_array);