From 5243c3046490c7d97c96b33186a352d3988d9114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 15 Dec 2023 11:04:22 -0500
Subject: [PATCH] jamiaccount: do not lock connManager before calling
convModule()
Else, we will have connManagerMtx & configurationMutex_ locked at the
same time
Change-Id: Icf4245bc2d4151c75b52960289a9cdd654ee3278
---
src/jamidht/jamiaccount.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index 8e6c57ce5e..015f54959f 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -2207,8 +2207,8 @@ JamiAccount::convModule()
auto shared = w.lock();
if (!shared)
return;
- std::lock_guard<std::mutex> lkCM(shared->connManagerMtx_);
auto cm = shared->convModule();
+ std::lock_guard<std::mutex> lkCM(shared->connManagerMtx_);
if (!shared->connectionManager_ || !cm || cm->isBanned(convId, deviceId)) {
Manager::instance().ioContext()->post([cb] { cb({}); });
return;
--
GitLab