diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:49:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:49:43 -0400 |
| commit | ed84dab8b4cd691dcdc0fecfb9c451bb0ffd930a (patch) | |
| tree | 9ec125760c2bf8e1980063e93cedceaa1d13bcfa | |
| parent | 6e9d5fc4ec40136d173be680a85a9bfb9b99fea4 (diff) | |
| parent | a3ec89a4f8a6222403697b7f7fce5d5138b79994 (diff) | |
| download | tor-ed84dab8b4cd691dcdc0fecfb9c451bb0ffd930a.tar.gz tor-ed84dab8b4cd691dcdc0fecfb9c451bb0ffd930a.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -rw-r--r-- | src/test/test_channelpadding.c | 1 | ||||
| -rw-r--r-- | src/test/test_hs_descriptor.c | 3 | ||||
| -rw-r--r-- | src/test/test_shared_random.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index aaa6fc007f..391ead3c72 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -680,6 +680,7 @@ test_channelpadding_consensus(void *arg) memcpy(relay->identity_digest, ((channel_tls_t *)chan)->conn->identity_digest, DIGEST_LEN); smartlist_add(current_md_consensus->routerstatus_list, relay); + relay = NULL; /* Prevent double-free */ tried_to_write_cell = 0; decision = channelpadding_decide_to_pad_channel(chan); diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index a5e9b96673..897b441888 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -208,6 +208,7 @@ test_link_specifier(void *arg) tt_int_op(link_specifier_get_un_ipv4_port(ls), OP_EQ, spec.u.ap.port); link_specifier_free(ls); + ls = NULL; tor_free(b64); } @@ -238,6 +239,7 @@ test_link_specifier(void *arg) tt_int_op(link_specifier_get_un_ipv6_port(ls), OP_EQ, spec.u.ap.port); link_specifier_free(ls); + ls = NULL; tor_free(b64); } @@ -265,6 +267,7 @@ test_link_specifier(void *arg) tt_mem_op(spec.u.legacy_id, OP_EQ, id, DIGEST_LEN); link_specifier_free(ls); + ls = NULL; tor_free(b64); } diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 0d0a2ad9ae..b7cd33715f 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -869,6 +869,7 @@ test_sr_setup_commits(void) /* Now during REVEAL phase save commit D by restoring its reveal. */ set_sr_phase(SR_PHASE_REVEAL); save_commit_to_state(place_holder); + place_holder = NULL; tt_str_op(commit_d->encoded_reveal, OP_EQ, "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"); /* Go back to an empty encoded reveal value. */ |