Commit fd8ce812 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.5' into maint-0.4.2

parents 0f218a05 0c0214bc

changes/ticket28992

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/feature/hs/hs_client.c

+8 −3
Original line number Diff line number Diff line
@@ -606,9 +606,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;

  }