From 4d70e725d16abc2f85d54b91f50e75c37c765087 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 6 Nov 2019 11:33:23 -0500 Subject: Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a configuration that failed during the options_act() stage. Fixes bug 32407; bugfix on 0.3.3.1-alpha. --- src/core/mainloop/mainloop.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core/mainloop/mainloop.c') diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 6e2b300fb4..64df495ba0 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. */ -- cgit v1.2.3-54-g00ecf