From 062111c7c676efea0ed98be9a0bdfb9690534e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 23 Jun 2021 12:39:28 -0400
Subject: [PATCH] jamiaccount: avoid use after move
Change-Id: Ie72b4c03bfe5d948a0aa8e48ae8a5d99f1650f42
---
src/jamidht/jamiaccount.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index cc1a520dcb..dd03af28db 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -1206,10 +1206,11 @@ JamiAccount::loadAccount(const std::string& archive_password,
auto details = vCard::utils::toMap(
std::string_view(reinterpret_cast<const char*>(payload.data()), payload.size()));
req.metadatas = ConversationRepository::infosFromVCard(details);
+ auto reqMap = req.toMap();
accountManager_->addConversationRequest(conversationId, std::move(req));
emitSignal<DRing::ConversationSignal::ConversationRequestReceived>(getAccountID(),
conversationId,
- req.toMap());
+ reqMap);
}
},
[this](const std::map<dht::InfoHash, KnownDevice>& devices) {
@@ -4386,13 +4387,12 @@ JamiAccount::onConversationRequest(const std::string& from, const Json::Value& v
return;
}
req.received = std::time(nullptr);
+ auto reqMap = req.toMap();
accountManager_->addConversationRequest(convId, std::move(req));
// Note: no need to sync here because over connected devices should receives
// the same conversation request. Will sync when the conversation will be added
- emitSignal<DRing::ConversationSignal::ConversationRequestReceived>(accountID_,
- convId,
- req.toMap());
+ emitSignal<DRing::ConversationSignal::ConversationRequestReceived>(accountID_, convId, reqMap);
}
void
--
GitLab