diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-17 13:56:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-17 13:56:10 -0400 |
| commit | 6803373aab2292fe7286d1e19e25d5016b6ac9b8 (patch) | |
| tree | 6b691c9fb4be33b4879d83858b60a9ac93df96aa /src | |
| parent | bc4c89eb2f47ba0774a05aea3798fbec31f9b920 (diff) | |
| parent | 4ee2699416dc612b859f6ba77e6fcd2e7e55c1b7 (diff) | |
| download | tor-6803373aab2292fe7286d1e19e25d5016b6ac9b8.tar.gz tor-6803373aab2292fe7286d1e19e25d5016b6ac9b8.zip | |
Merge branch 'maint-0.4.2' into maint-0.4.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/or/circuitpadding.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 3853e9fdc4..43f4a31624 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -2446,9 +2446,12 @@ circpad_setup_machine_on_circ(circuit_t *on_circ, return; } - tor_assert_nonfatal(on_circ->padding_machine[machine->machine_index] - == NULL); - tor_assert_nonfatal(on_circ->padding_info[machine->machine_index] == NULL); + IF_BUG_ONCE(on_circ->padding_machine[machine->machine_index] != NULL) { + return; + } + IF_BUG_ONCE(on_circ->padding_info[machine->machine_index] != NULL) { + return; + } /* Log message */ if (CIRCUIT_IS_ORIGIN(on_circ)) { |