commit 649539e82ae98889653c39a78afc4e261b83f677 parent 1a5b612832b46331a2a545329cfa78d36130d84f Author: David Goulet <dgoulet@torproject.org> Date: Wed, 16 Mar 2022 14:47:21 -0400 Merge branch 'tor-gitlab/mr/550' Diffstat:
| M | src/feature/relay/dns.c | | | 9 | ++++++--- |
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c @@ -1416,12 +1416,15 @@ get_consensus_param_exit_dns_attempts(void) return str; } -/** Configure the libevent options. This can be called after initialization. - * This should never be called without the evdns base pointer initialized. */ +/** Configure the libevent options. This can safely be called after + * initialization or even if the evdns base is not set. */ static void configure_libevent_options(void) { - if (BUG(!the_evdns_base)) { + /* This is possible because we can get called when a new consensus is set + * while the DNS subsystem is not initialized just yet. It should be + * harmless. */ + if (!the_evdns_base) { return; }