From: David Goulet <dgoulet@torproject.org>
Date: Wed, 16 Mar 2022 17:42:42 +0000 (-0400)
Subject: dns: Remove reachable BUG()
X-Git-Tag: tor-0.4.7.5-alpha~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f783bab40e489524565c824e0e9fe8a116d7079;p=thirdparty%2Ftor.git

dns: Remove reachable BUG()

Fixes #40587

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
index 0af80d52ae..4ae4a8e4b9 100644
--- 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;
   }