diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-06-29 12:55:35 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-06-29 12:55:35 -0400 |
commit | b31086201178c954e4d300273bbc7c7f5d4d6a8a (patch) | |
tree | ac0d30ca6df16ffa17eab21fb67d39efcb665935 | |
parent | 9c217cd4784f80641da2cdac96e452ccd25d050f (diff) | |
parent | 0c0214bcc08e85040e8eb12f8388a45d271a6918 (diff) | |
download | tor-b31086201178c954e4d300273bbc7c7f5d4d6a8a.tar.gz tor-b31086201178c954e4d300273bbc7c7f5d4d6a8a.zip |
Merge branch 'maint-0.3.5' into release-0.3.5
-rw-r--r-- | changes/ticket28992 | 3 | ||||
-rw-r--r-- | src/feature/hs/hs_client.c | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/changes/ticket28992 b/changes/ticket28992 new file mode 100644 index 0000000000..3e45d73e45 --- /dev/null +++ b/changes/ticket28992 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion service v3, client): + - Remove a BUG() that is causing a stacktrace for a situation that very + rarely happens but still can. Fixes bug 28992; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 0efe9fc28e..c65f857419 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -596,9 +596,14 @@ send_introduce1(origin_circuit_t *intro_circ, /* We need to find which intro point in the descriptor we are connected to * on intro_circ. */ ip = find_desc_intro_point_by_ident(intro_circ->hs_ident, desc); - if (BUG(ip == NULL)) { - /* If we can find a descriptor from this introduction circuit ident, we - * must have a valid intro point object. Permanent error. */ + if (ip == NULL) { + /* The following is possible if the descriptor was changed while we had + * this introduction circuit open and waiting for the rendezvous circuit to + * be ready. Which results in this situation where we can't find the + * corresponding intro point within the descriptor of the service. */ + log_info(LD_REND, "Unable to find introduction point for service %s " + "while trying to send an INTRODUCE1 cell.", + safe_str_client(onion_address)); goto perm_err; } |