From: Loïc Blot <nerzhul@users.noreply.github.com>
Date: Tue, 10 Oct 2017 10:27:08 +0000 (+0200)
Subject: Thread: fix a crash on Windows due to data race condition on Thread::m_start_finished... 
X-Git-Tag: 5.0.0~779
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=32ae4926578844eac1a7b72fcd4e26eb854eb7e5;p=oweals%2Fminetest.git

Thread: fix a crash on Windows due to data race condition on Thread::m_start_finished_mutex (#6515)
---

diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index 09cc7d836..3b6851389 100644
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -74,8 +74,8 @@ Thread::~Thread()
 	kill();
 
 	// Make sure start finished mutex is unlocked before it's destroyed
-	m_start_finished_mutex.try_lock();
-	m_start_finished_mutex.unlock();
+	if (m_start_finished_mutex.try_lock())
+		m_start_finished_mutex.unlock();
 
 }
 
@@ -196,6 +196,10 @@ void Thread::threadProc(Thread *thr)
 	thr->m_retval = thr->run();
 
 	thr->m_running = false;
+	// Unlock m_start_finished_mutex to prevent data race condition on Windows.
+	// On Windows with VS2017 build TerminateThread is called and this mutex is not
+	// released. We try to unlock it from caller thread and it's refused by system.
+	thr->m_start_finished_mutex.unlock();
 	g_logger.deregisterThread();
 }