Lock whole adding/finding contact

1 files changed, 36 insertions, 26 deletions

diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp
index 6815af9f59..1b3620e736 100644
--- a/protocols/Steam/src/steam_contacts.cpp
+++ b/protocols/Steam/src/steam_contacts.cpp
@@ -346,7 +346,17 @@ void CSteamProto::ContactIsAskingAuth(MCONTACT hContact)
 
 MCONTACT CSteamProto::AddContact(const char *steamId, bool isTemporary)
 {
-	MCONTACT hContact = this->FindContact(steamId);
+	MCONTACT hContact = NULL;
+
+	mir_cslock lck(this->contact_search_lock);
+
+	for (hContact = db_find_first(this->m_szModuleName); hContact; hContact = db_find_next(hContact, this->m_szModuleName))
+	{
+		ptrA cSteamId(db_get_sa(hContact, this->m_szModuleName, "SteamID"));
+		if (!lstrcmpA(cSteamId, steamId))
+			break;
+	}
+
 	if (!hContact)
 	{
 		// create contact
@@ -436,30 +446,34 @@ void CSteamProto::OnGotFriendList(const HttpResponse *response)
 		}
 	}
 
-	// Check and update contacts in database
-	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName))
 	{
-		if (isChatRoom(hContact))
-			continue;
+		// Check and update contacts in database
+		mir_cslock lck(this->contact_search_lock);
 
-		ptrA id(getStringA(hContact, "SteamID"));
-		if (id == NULL)
-			continue;
+		for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName))
+		{
+			if (isChatRoom(hContact))
+				continue;
 
-		std::map<std::string, JSONNode*>::iterator it = friends.find(std::string(id));
+			ptrA id(getStringA(hContact, "SteamID"));
+			if (id == NULL)
+				continue;
 
-		if (it != friends.end())
-		{
-			// Contact is on server-list, update (and eventually notify) it
-			UpdateContactRelationship(hContact, it->second);
+			std::map<std::string, JSONNode*>::iterator it = friends.find(std::string(id));
 
-			steamIds.append(",").append(it->first);
-			friends.erase(it);
-		}
-		else
-		{
-			// Contact was removed from server-list, notify it
-			ContactIsRemoved(hContact);
+			if (it != friends.end())
+			{
+				// Contact is on server-list, update (and eventually notify) it
+				UpdateContactRelationship(hContact, it->second);
+
+				steamIds.append(",").append(it->first);
+				friends.erase(it);
+			}
+			else
+			{
+				// Contact was removed from server-list, notify it
+				ContactIsRemoved(hContact);
+			}
 		}
 	}
 
@@ -563,9 +577,7 @@ void CSteamProto::OnGotUserSummaries(const HttpResponse *response)
 
 			MCONTACT hContact = NULL;
 			if (!IsMe(steamId)) {
-				hContact = FindContact(steamId);
-				if (!hContact)
-					hContact = AddContact(steamId);
+				hContact = AddContact(steamId);
 			}
 
 			UpdateContactDetails(hContact, item);
@@ -671,9 +683,7 @@ void CSteamProto::OnAuthRequested(const HttpResponse *response, void *arg)
 		node = json_get(nroot, "steamid");
 		ptrA steamId(mir_u2a(ptrW(json_as_string(node))));
 
-		MCONTACT hContact = FindContact(steamId);
-		if (!hContact)
-			hContact = AddContact(steamId);
+		MCONTACT hContact = AddContact(steamId);
 
 		UpdateContactDetails(hContact, nroot);