summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2020-07-09 17:08:07 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2020-07-09 17:08:07 +0300
commite500ea2eae0652dad94e16cf2765044146740ce3 (patch)
treef2d9823bcbfec7e877a48bdd09fc8c366c4144c4 /src
parent8dd89e433078245778924ce67403673e9d35a5c3 (diff)
parent63a54858c3b44f68d89590a992e3120f92c1b6ac (diff)
downloadtor-e500ea2eae0652dad94e16cf2765044146740ce3.tar.gz
tor-e500ea2eae0652dad94e16cf2765044146740ce3.zip
Merge branch 'tor-github/pr/1989' into maint-0.4.4
Diffstat (limited to 'src')
-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 7f4d5385e9..892f69a3a0 100644
--- 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