Commit e0e0ef71 authored by Nick Mathewson's avatar Nick Mathewson 🐦
Browse files

Merge remote-tracking branch 'tor-gitlab/mr/137' into maint-0.3.5

parents 84a5bd48 ea339227
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.
...@@ -2923,7 +2923,14 @@ retry_all_listeners(smartlist_t *new_conns, int close_all_noncontrol) ...@@ -2923,7 +2923,14 @@ retry_all_listeners(smartlist_t *new_conns, int close_all_noncontrol)
&skip, &addr_in_use); &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); smartlist_add(new_conns, new_conn);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment