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 | cd3f9572199c254e6c7896b61b361061919021bb (patch) | |
| tree | 0d5a8f5ca88c5e174c7efb747936ca99bc1802d3 | |
| parent | 1f389dadd02e9a234ee1d1c316cdb6dcc2b25489 (diff) | |
| parent | 75a6e7e256719c33329cd172248f4f2dfc80ad8c (diff) | |
| download | tor-cd3f9572199c254e6c7896b61b361061919021bb.tar.gz tor-cd3f9572199c254e6c7896b61b361061919021bb.zip | |
Merge branch 'maint-0.3.4'
| -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 d61c486fa9..4ae7e16361 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -706,6 +706,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 75f507bccd..43d4955905 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -210,6 +210,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); } @@ -240,6 +241,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); } @@ -267,6 +269,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 fbf505cc9a..91ae20bff8 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -878,6 +878,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. */ |