nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

hs-v3: Remove BUG() that can occur normally

Browse Source 
Fixes #28992

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2020-02-04 10:13:10 -05:00 committed by George Kadianakis
parent 41d52e9cd8
commit 40a321659a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket28992 Normal file
View File

@ -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.

11
src/feature/hs/hs_client.c
View File

@ -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;
}