From 19343ddd557fd03aecf7a19d310f46c62a8f336f Mon Sep 17 00:00:00 2001 From: QAston Date: Sun, 18 Aug 2013 17:43:24 +0200 Subject: Fix crashed caused by using openssl from multiple threads simultanously. Note that this doesn't make BigNumber class threadsafe - it never was that way. --- src/server/worldserver/Master.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/server/worldserver/Master.cpp') diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 6fd57179140..b2a6b60ac4f 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -44,6 +44,7 @@ #include "RealmList.h" #include "BigNumber.h" +#include "OpenSSLCrypto.h" #ifdef _WIN32 #include "ServiceWin32.h" @@ -121,6 +122,7 @@ public: /// Main function int Master::Run() { + OpenSSLCrypto::threadsSetup(); BigNumber seed1; seed1.SetRand(16 * 8); @@ -368,6 +370,7 @@ int Master::Run() // fixes a memory leak related to detaching threads from the module //UnloadScriptingModule(); + OpenSSLCrypto::threadsCleanup(); // Exit the process with specified return value return World::GetExitCode(); } -- cgit v1.2.3