From bdc5a12a07f2ad6234376abc6d921cbd9f41435b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 12 Jan 2022 13:11:36 -0500
Subject: [PATCH] conversation_module: avoid double lock
cloneConversation try to lock conversationsMtx_ a second time.
Change-Id: I1e685a7ad478d1153ec480d2a7dd3ac962478099
---
src/jamidht/conversation_module.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jamidht/conversation_module.cpp b/src/jamidht/conversation_module.cpp
index 8257e4681c..fadcb26021 100644
--- a/src/jamidht/conversation_module.cpp
+++ b/src/jamidht/conversation_module.cpp
@@ -407,11 +407,11 @@ ConversationModule::Impl::fetchNewCommits(const std::string& peer,
auto convIt = convInfos_.find(conversationId);
clone = convIt != convInfos_.end();
}
+ lk.unlock();
if (clone) {
cloneConversation(deviceId, peer, conversationId);
return;
}
- lk.unlock();
JAMI_WARN("[Account %s] Could not find conversation %s, ask for an invite",
accountId_.c_str(),
conversationId.c_str());
--
GitLab