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 /src/test/test_channelpadding.c | |
| 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
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 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); |