commit e500ea2eae0652dad94e16cf2765044146740ce3 parent 8dd89e433078245778924ce67403673e9d35a5c3 Author: George Kadianakis <desnacked@riseup.net> Date: Thu, 9 Jul 2020 17:08:07 +0300 Merge branch 'tor-github/pr/1989' into maint-0.4.4 Diffstat:
| A | changes/ticket34087 | | | 3 | +++ |
| M | src/feature/hs/hs_client.c | | | 6 | ++++-- |
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/ticket34087 b/changes/ticket34087 @@ -0,0 +1,3 @@ + o Minor bugfix (onion service v3 client): + - Remove a BUG() warning that can occur naturally. Fixes bug 34087; bugfix + on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c @@ -1065,8 +1065,10 @@ close_or_reextend_intro_circ(origin_circuit_t *intro_circ) tor_assert(intro_circ); desc = hs_cache_lookup_as_client(&intro_circ->hs_ident->identity_pk); - if (BUG(desc == NULL)) { - /* We can't continue without a descriptor. */ + if (desc == NULL) { + /* We can't continue without a descriptor. This is possible if the cache + * was cleaned up between the intro point established and the reception of + * the introduce ack. */ goto close; } /* We still have the descriptor, great! Let's try to see if we can