tor

commit e0e0ef713e96a196782fec754b11874675263c04
parent 84a5bd48e2717f29b547d9fd43d83cab3da39aaa
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  7 Oct 2020 08:07:53 -0400

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

Diffstat:
A
changes/ticket40073
 | 
3
+++
M
src/core/mainloop/connection.c
 | 
9
++++++++-

2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/changes/ticket40073 b/changes/ticket40073
@@ -0,0 +1,3 @@
+  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.
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
@@ -2923,7 +2923,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);