summaryrefslogtreecommitdiff
path: root/src/feature/hs/hs_client.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2020-07-09 17:08:34 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2020-07-09 17:08:34 +0300
commitb1a32761bec22443b8ac745d798b86a4c9d5bd2d (patch)
treed2ebca2ba1b5266eaa77550f5efa00322184629e /src/feature/hs/hs_client.c
parentbe6b30e642eafc8ad9552e08ab117ac2a9900623 (diff)
parente500ea2eae0652dad94e16cf2765044146740ce3 (diff)
downloadtor-b1a32761bec22443b8ac745d798b86a4c9d5bd2d.tar.gz
tor-b1a32761bec22443b8ac745d798b86a4c9d5bd2d.zip
Merge branch 'maint-0.4.4'
Diffstat (limited to 'src/feature/hs/hs_client.c')
-rw-r--r--src/feature/hs/hs_client.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index 80f4fb8484..09f0657fa8 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -1066,8 +1066,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