tor

commit 75e5b778e10cbc6caa4e4902e288a0c63f92ce06
parent 382beb93cb4110b2bcc82ab69c8e72c274a51ca2
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 10 May 2018 19:31:11 -0400

Merge remote-tracking branch 'public/bug25981'

Diffstat:
M
src/or/main.c
 | 
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/or/main.c b/src/or/main.c
@@ -1672,6 +1672,11 @@ static mainloop_event_t *postloop_cleanup_ev=NULL;
 void
 mainloop_schedule_postloop_cleanup(void)
 {
+  if (PREDICT_UNLIKELY(postloop_cleanup_ev == NULL)) {
+    // (It's possible that we can get here if we decide to close a connection
+    // in the earliest stages of our configuration, before we create events.)
+    return;
+  }
   mainloop_event_activate(postloop_cleanup_ev);
 }