vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-10 04:30:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lock the active plugins map early

Browse Source 
To prevent a race condition when an exiting plugin wants to terminate
the process when it think there are no plugins left just as another
yabridge instance is connecting to the group socket.
This commit is contained in:
Robbert van der Helm
2020-05-21 17:10:33 +02:00
parent 8eb01cb519
commit 17cff5722e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/bridges/group.cpp
+2 -1
View File
@@ -98,6 +98,8 @@ void GroupBridge::accept_requests() {
group_socket_acceptor.async_accept( group_socket_acceptor.async_accept(
[&](const boost::system::error_code& error, [&](const boost::system::error_code& error,
boost::asio::local::stream_protocol::socket socket) { boost::asio::local::stream_protocol::socket socket) {
std::lock_guard lock(active_plugins_mutex);
// Stop the whole process when the socket gets closed unexpectedly // Stop the whole process when the socket gets closed unexpectedly
if (error.failed()) { if (error.failed()) {
logger.log("Error while listening for incoming connections:"); logger.log("Error while listening for incoming connections:");
@@ -120,7 +122,6 @@ void GroupBridge::accept_requests() {
// Collisions in the generated socket names should be very rare, but // Collisions in the generated socket names should be very rare, but
// it could in theory happen // it could in theory happen
std::lock_guard lock(active_plugins_mutex);
assert(active_plugins.find(parameters) != active_plugins.end()); assert(active_plugins.find(parameters) != active_plugins.end());
// CreateThread() doesn't support multiple arguments and requires // CreateThread() doesn't support multiple arguments and requires