Commit 8505dd5e authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.4.3' into maint-0.4.4

parents 30c6b42d 90294444

changes/ticket40073

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (relay configuration, crash):

    - Avoid a fatal assert() when failing to create a listener connection for an

      address that was in use. Fixes bug 40073; bugfix on 0.3.5.1-alpha.

src/core/mainloop/connection.c

+8 −1
Original line number Diff line number Diff line
@@ -3048,7 +3048,14 @@ retry_all_listeners(smartlist_t *new_conns, int close_all_noncontrol) 
                                                  &skip, &addr_in_use);

    }



    tor_assert(new_conn);

    /* There are many reasons why we can't open a new listener port so in case

     * we hit those, bail early so tor can stop. */

    if (!new_conn) {

      log_warn(LD_NET, "Unable to create listener port: %s:%d",

               fmt_addr(&r->new_port->addr), r->new_port->port);

      retval = -1;

      break;

    }



    smartlist_add(new_conns, new_conn);