diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-03-29 14:28:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-03-29 14:28:48 -0400 |
| commit | 9ed02ec2824059b9c18c2cadfd972c8a2e09b94c (patch) | |
| tree | 8563685cd86889d8866046b1e15ac1e57bfbce4e /src/core/or/circuituse.c | |
| parent | 00ca3d04cfa0625349a47d1a2f7c16ac66e7822d (diff) | |
| parent | 537ad0bca3479c10fc7d1093aff534be11800dcb (diff) | |
| download | tor-9ed02ec2824059b9c18c2cadfd972c8a2e09b94c.tar.gz tor-9ed02ec2824059b9c18c2cadfd972c8a2e09b94c.zip | |
Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged
Diffstat (limited to 'src/core/or/circuituse.c')
| -rw-r--r-- | src/core/or/circuituse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 2d0e75e53b..2f27cf996f 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -3121,7 +3121,9 @@ circuit_sent_valid_data(origin_circuit_t *circ, uint16_t relay_body_len) { if (!circ) return; - tor_assert_nonfatal(relay_body_len <= RELAY_PAYLOAD_SIZE); + tor_assertf_nonfatal(relay_body_len <= RELAY_PAYLOAD_SIZE, + "Wrong relay_body_len: %d (should be at most %d)", + relay_body_len, RELAY_PAYLOAD_SIZE); circ->n_delivered_written_circ_bw = tor_add_u32_nowrap(circ->n_delivered_written_circ_bw, relay_body_len); |