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 | 36c372581f8d7651c336f69b9b1b051d3d31d548 (patch) | |
| tree | e747a17b19a9777fa1c76caecc4948d1c8397e75 /src/test/test_channelpadding.c | |
| parent | 92b4996b233a6a5d034b4ecc47b9f97985bb5886 (diff) | |
| parent | ed84dab8b4cd691dcdc0fecfb9c451bb0ffd930a (diff) | |
| download | tor-36c372581f8d7651c336f69b9b1b051d3d31d548.tar.gz tor-36c372581f8d7651c336f69b9b1b051d3d31d548.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/test/test_channelpadding.c')
| -rw-r--r-- | src/test/test_channelpadding.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 740368f218..90da2163a6 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -701,6 +701,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); |