From: Yawning Angel <yawning@schwanenlied.me>
Date: Wed, 18 Nov 2015 11:27:24 +0000 (+0000)
Subject: Fix a startup time assert caused by periodic events not being initialized.
X-Git-Tag: tor-0.2.8.1-alpha~233
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85bb71049ac582e886144fd74fb869f4c7bdc5a8;p=thirdparty%2Ftor.git

Fix a startup time assert caused by periodic events not being initialized.

Loading a on disk bridge descriptor causes a directory download to be
scheduled, which asserts due to the periodic events not being
initialized yet.

Fixes bug #17635, not in any released version of tor.
---

diff --git a/src/or/main.c b/src/or/main.c
index 0b8591f1d4..7aeacd138d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2299,6 +2299,13 @@ do_main_loop(void)
 {
   time_t now;
 
+  /* initialize the periodic events first, so that code that depends on the
+   * events being present does not assert.
+   */
+  if (! periodic_events_initialized) {
+    initialize_periodic_events();
+  }
+
   /* initialize dns resolve map, spawn workers if needed */
   if (dns_init() < 0) {
     if (get_options()->ServerDNSAllowBrokenConfig)
@@ -2401,10 +2408,6 @@ do_main_loop(void)
     tor_assert(second_timer);
   }
 
-  if (! periodic_events_initialized) {
-    initialize_periodic_events();
-  }
-
 #ifdef HAVE_SYSTEMD_209
   uint64_t watchdog_delay;
   /* set up systemd watchdog notification. */