Ensure all ACL write operations hold qrwlVoiceThread.

1 files changed, 18 insertions, 8 deletions

diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp
index 4fc6dc15e..0ff6de4f3 100644
--- a/src/murmur/MurmurIce.cpp
+++ b/src/murmur/MurmurIce.cpp
@@ -1611,11 +1611,16 @@ static void impl_Server_addUserToGroup(const ::Murmur::AMD_Server_addUserToGroup
 		return;
 	}
 
-	::Group *g = channel->qhGroups.value(qsgroup);
-	if (! g)
-		g = new ::Group(channel, qsgroup);
+	{
+		QWriteLocker wl(&server->qrwlVoiceThread);
+
+		::Group *g = channel->qhGroups.value(qsgroup);
+		if (! g)
+			g = new ::Group(channel, qsgroup);
+
+		g->qsTemporary.insert(- session);
+	}
 
-	g->qsTemporary.insert(- session);
 	server->clearACLCache(user);
 
 	cb->ice_response();
@@ -1632,11 +1637,16 @@ static void impl_Server_removeUserFromGroup(const ::Murmur::AMD_Server_removeUse
 		return;
 	}
 
-	::Group *g = channel->qhGroups.value(qsgroup);
-	if (! g)
-		g = new ::Group(channel, qsgroup);
+	{
+		QWriteLocker qrwl(&server->qrwlVoiceThread);
+
+		::Group *g = channel->qhGroups.value(qsgroup);
+		if (!g)
+			g = new ::Group(channel, qsgroup);
+
+		g->qsTemporary.remove(-session);
+	}
 
-	g->qsTemporary.remove(- session);
 	server->clearACLCache(user);
 
 	cb->ice_response();