diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-07-09 17:08:07 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-07-09 17:08:07 +0300 |
| commit | e500ea2eae0652dad94e16cf2765044146740ce3 (patch) | |
| tree | f2d9823bcbfec7e877a48bdd09fc8c366c4144c4 | |
| parent | 8dd89e433078245778924ce67403673e9d35a5c3 (diff) | |
| parent | 63a54858c3b44f68d89590a992e3120f92c1b6ac (diff) | |
| download | tor-e500ea2eae0652dad94e16cf2765044146740ce3.tar.gz tor-e500ea2eae0652dad94e16cf2765044146740ce3.zip | |
Merge branch 'tor-github/pr/1989' into maint-0.4.4
| -rw-r--r-- | changes/ticket34087 | 3 | ||||
| -rw-r--r-- | src/feature/hs/hs_client.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/ticket34087 b/changes/ticket34087 new file mode 100644 index 0000000000..16990c305a --- /dev/null +++ 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 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 |