diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:25:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:25:56 -0500 |
| commit | ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb (patch) | |
| tree | f25b78643775324222c9684b6f2c2c100c70648b /src/feature | |
| parent | fcae26adf710cf1fe393fde723e9a2caf6012b09 (diff) | |
| download | tor-ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb.tar.gz tor-ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb.zip | |
Fix warnings in current debian-hardened CI.
We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.
Fixes bug 40241. Bugfix on 0.3.5.4-alpha.
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/client/entrynodes.c | 2 | ||||
| -rw-r--r-- | src/feature/rend/rendclient.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 8d9230b66b..c930fe244f 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs, break; default: tor_assert_nonfatal_unreached(); +#ifndef ALL_BUGS_ARE_FATAL FALLTHROUGH; +#endif case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD: if (guard->is_primary) { /* XXXX #20832 -- I don't actually like this logic. It seems to make diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 5c9dbea8e3..acff805c0e 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro, log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.", failure_type); tor_fragile_assert(); +#ifndef ALL_BUGS_ARE_FATAL FALLTHROUGH; +#endif case INTRO_POINT_FAILURE_GENERIC: rend_cache_intro_failure_note(failure_type, (uint8_t *)failed_intro->identity_digest, |