diff options
| author | teor <teor@torproject.org> | 2019-11-07 10:51:22 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-07 10:51:22 +1000 |
| commit | 1f3bf10d3f4e59cbf858ff5ee6f398d990cc15c7 (patch) | |
| tree | 22fdd785f08c43eeb54d0ca4fad141f27045d163 /src/core | |
| parent | 8f6dc54e3c7299a6f224ccb474d3398d42542086 (diff) | |
| parent | 4d70e725d16abc2f85d54b91f50e75c37c765087 (diff) | |
| download | tor-1f3bf10d3f4e59cbf858ff5ee6f398d990cc15c7.tar.gz tor-1f3bf10d3f4e59cbf858ff5ee6f398d990cc15c7.zip | |
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2
Diffstat (limited to 'src/core')
| -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 6f29a6981a..c47e440774 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -769,6 +769,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. */ |