[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Michael Meeks (via logerrit)]

 wsd/LOOLWSD.cpp |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 38934525dd11e45b6779b3da54f58bdf3ca2711e
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Jun 21 16:02:00 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 21 17:06:43 2019 +0200

    Cleanup sensibly on exceptions.
    
    Otherwise atexit handlers can get very upset.
    
    Change-Id: I693ff3ee43dd8eedc0838b633445ae81229b7fcf
    Reviewed-on: https://gerrit.libreoffice.org/74516
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 01780a86a..420300a79 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3370,6 +3370,8 @@ void LOOLWSD::cleanup()
     }
 #endif
 #endif
+    Socket::InhibitThreadChecks = true;
+    SocketPoll::InhibitThreadChecks = true;
 }
 
 int LOOLWSD::main(const std::vector<std::string>& /*args*/)
@@ -3384,6 +3386,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
         returnValue = innerMain();
     } catch (const std::runtime_error& e) {
         LOG_FTL(e.what());
+        cleanup();
         throw;
     } catch (...) {
         cleanup();