diff options
| author | teor <teor@torproject.org> | 2020-01-16 09:57:27 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-01-16 09:57:27 +1000 |
| commit | 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa (patch) | |
| tree | 680281bff12c0fd8bddd26ce29f087ea7cf42ce7 /src/core/mainloop | |
| parent | 0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8 (diff) | |
| parent | 4d70e725d16abc2f85d54b91f50e75c37c765087 (diff) | |
| download | tor-19954cffd7710ccac778aa5cf15ae1bc6a5d56fa.tar.gz tor-19954cffd7710ccac778aa5cf15ae1bc6a5d56fa.zip | |
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/mainloop.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 4b3c3bf6af..f0aa37e8da 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -774,6 +774,10 @@ tor_shutdown_event_loop_and_exit(int exitcode) main_loop_should_exit = 1; main_loop_exit_value = exitcode; + if (! tor_libevent_is_initialized()) { + return; /* No event loop to shut down. */ + } + /* Die with an assertion failure in ten seconds, if for some reason we don't * exit normally. */ /* XXXX We should consider this code if it's never used. */ |