diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-14 15:31:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-14 15:31:52 -0400 |
| commit | 2dccef0eb490fa7d8fabc0d93e37d6635910f174 (patch) | |
| tree | 65138098218cb4b11ffcbd3f6ac90501c45e2e99 /src/core/or/channelpadding.c | |
| parent | 2c5c17510acf0cbd0eeb874a2f4c62203bf9392f (diff) | |
| parent | 6925b61cfdf50a5686de02645b04b269c031f05d (diff) | |
| download | tor-2dccef0eb490fa7d8fabc0d93e37d6635910f174.tar.gz tor-2dccef0eb490fa7d8fabc0d93e37d6635910f174.zip | |
Merge branch 'bug27772_squashed'
Diffstat (limited to 'src/core/or/channelpadding.c')
| -rw-r--r-- | src/core/or/channelpadding.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/or/channelpadding.c b/src/core/or/channelpadding.c index db34f0f027..fcc3b8f03d 100644 --- a/src/core/or/channelpadding.c +++ b/src/core/or/channelpadding.c @@ -297,6 +297,7 @@ channelpadding_send_disable_command(channel_t *chan) channelpadding_negotiate_t disable; cell_t cell; + tor_assert(chan); tor_assert(BASE_CHAN_TO_TLS(chan)->conn->link_proto >= MIN_LINK_PROTO_FOR_CHANNEL_PADDING); @@ -329,6 +330,7 @@ channelpadding_send_enable_command(channel_t *chan, uint16_t low_timeout, channelpadding_negotiate_t enable; cell_t cell; + tor_assert(chan); tor_assert(BASE_CHAN_TO_TLS(chan)->conn->link_proto >= MIN_LINK_PROTO_FOR_CHANNEL_PADDING); |