diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-10 19:31:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-10 19:31:11 -0400 |
| commit | 75e5b778e10cbc6caa4e4902e288a0c63f92ce06 (patch) | |
| tree | a5dfdaa02d1efc56a2421f9893005509d6765833 /src/or/main.c | |
| parent | 382beb93cb4110b2bcc82ab69c8e72c274a51ca2 (diff) | |
| parent | 8b1380cbd08f40dc2abee171a390df6d04e999d1 (diff) | |
| download | tor-75e5b778e10cbc6caa4e4902e288a0c63f92ce06.tar.gz tor-75e5b778e10cbc6caa4e4902e288a0c63f92ce06.zip | |
Merge remote-tracking branch 'public/bug25981'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 6cb9b62496..9dce158b33 100644 --- 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); } |