From dc370fdd8d1f6846a72903204e6fce5e9a45ce72 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 19 Aug 2013 14:18:18 -0500 Subject: [PATCH] Fix a deadlock w/ SQLite. sqlite3_shutdown() was called a bit too early, when SQLite-using threads may still have yet to fully shutdown. --- src/main.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cc b/src/main.cc index fef3d94063..9868f62be9 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1154,10 +1154,10 @@ int main(int argc, char** argv) curl_global_cleanup(); #endif - sqlite3_shutdown(); - terminate_bro(); + sqlite3_shutdown(); + // Close files after net_delete(), because net_delete() // might write to connection content files. BroFile::CloseCachedFiles();