Commit 63a54858 authored Jul 09, 2020 by David Goulet

hs-v3: Remove a possible BUG() condition



When receiving an introduction NACK, the client either decides to close or
re-extend the circuit to another intro point.

In order to do this, the service descriptor needs to exists but it is possible
that it gets removed from the cache between the establishement of the
introduction circuit and the reception of the (N)ACK.

For that reason, the BUG(desc == NULL) is removed because it is a possible
normal use case. Tor recovers gracefully already.

Fixes #34087

Signed-off-by: David Goulet <dgoulet@torproject.org>

parent 1af7f40d

changes/ticket34087

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		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.

src/feature/hs/hs_client.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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