diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-08-03 11:49:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-08-03 11:49:09 -0400 |
| commit | aef9c0f5809d2978f16f08ada1f3e482bd4dbb6f (patch) | |
| tree | 515da617c2ac51de39c7d143dd6cc16023319f7b /src/core/or/circuitbuild.c | |
| parent | 18d2c7c5d7eb0441d891fb7642fbbabde6c53cf2 (diff) | |
| parent | 435f31aed34e9b58d1e8d9f460e6d2e3c6714fbc (diff) | |
| download | tor-aef9c0f5809d2978f16f08ada1f3e482bd4dbb6f.tar.gz tor-aef9c0f5809d2978f16f08ada1f3e482bd4dbb6f.zip | |
Merge branch 'ticket40081_035' into ticket40081_044
Resolves conflicts:
src/core/or/channel.c
src/test/test_channel.c
Diffstat (limited to 'src/core/or/circuitbuild.c')
| -rw-r--r-- | src/core/or/circuitbuild.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 83ce9f882b..a1b8ba78ab 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -728,6 +728,8 @@ circuit_deliver_create_cell,(circuit_t *circ, goto error; } + tor_assert_nonfatal_once(circ->n_chan->is_canonical); + memset(&cell, 0, sizeof(cell_t)); r = relayed ? create_cell_format_relayed(&cell, create_cell) : create_cell_format(&cell, create_cell); |