aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_channelpadding.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-29 13:49:43 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-29 13:49:43 -0400
commitcd3f9572199c254e6c7896b61b361061919021bb (patch)
tree0d5a8f5ca88c5e174c7efb747936ca99bc1802d3 /src/test/test_channelpadding.c
parent1f389dadd02e9a234ee1d1c316cdb6dcc2b25489 (diff)
parent75a6e7e256719c33329cd172248f4f2dfc80ad8c (diff)
downloadtor-cd3f9572199c254e6c7896b61b361061919021bb.tar.gz
tor-cd3f9572199c254e6c7896b61b361061919021bb.zip
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/test/test_channelpadding.c')
-rw-r--r--src/test/test_channelpadding.c1
1 files changed, 1 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);