diff options
| author | Neel Chauhan <neel@neelc.org> | 2017-09-19 16:08:24 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-11-30 12:16:18 -0500 |
| commit | d18a167ff38799ea5cd846dd80acccab6404952a (patch) | |
| tree | cc62e2ef88ef2c5460fc31f688e45a4b602c88d2 /src/feature/dirauth/shared_random_state.c | |
| parent | 72c1303cef629576cb8d078590ed71091828fd78 (diff) | |
| download | tor-d18a167ff38799ea5cd846dd80acccab6404952a.tar.gz tor-d18a167ff38799ea5cd846dd80acccab6404952a.zip | |
sr: Switch from tor_assert() to BUG()
Closes #19566
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/dirauth/shared_random_state.c')
| -rw-r--r-- | src/feature/dirauth/shared_random_state.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 38c7fd76d0..7ae4a5dc86 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -594,8 +594,10 @@ disk_state_update(void) { config_line_t **next, *line; - tor_assert(sr_disk_state); - tor_assert(sr_state); + if (BUG(!sr_disk_state)) + return; + if (BUG(!sr_state)) + return; /* Reset current disk state. */ disk_state_reset(); @@ -759,7 +761,8 @@ disk_state_save_to_disk(void) STATIC void reset_state_for_new_protocol_run(time_t valid_after) { - tor_assert(sr_state); + if (BUG(!sr_state)) + return; /* Keep counters in track */ sr_state->n_reveal_rounds = 0; @@ -1091,7 +1094,8 @@ sr_state_update(time_t valid_after) { sr_phase_t next_phase; - tor_assert(sr_state); + if (BUG(!sr_state)) + return; /* Don't call this function twice in the same voting period. */ if (valid_after <= sr_state->valid_after) { @@ -1130,7 +1134,8 @@ sr_state_update(time_t valid_after) /* Count the current round */ if (sr_state->phase == SR_PHASE_COMMIT) { /* invariant check: we've not entered reveal phase yet */ - tor_assert(sr_state->n_reveal_rounds == 0); + if (BUG(sr_state->n_reveal_rounds != 0)) + return; sr_state->n_commit_rounds++; } else { sr_state->n_reveal_rounds++; @@ -1320,7 +1325,8 @@ sr_state_init(int save_to_disk, int read_from_disk) void set_sr_phase(sr_phase_t phase) { - tor_assert(sr_state); + if (BUG(!sr_state)) + return; sr_state->phase = phase; } |