From 7bc5d593e4623cdcdc10ccfa585918deffc477e5 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Thu, 28 Dec 2017 15:59:09 -0500
Subject: [PATCH] fix crash during incoming call
fix nullptr access during incoming call on ringaccount
due to a missplaced method call.
Change-Id: Ia226d9d8e53ae8143b42d9b08814b5448c8be95d
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
---
src/ringdht/ringaccount.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index 52dbce05c0..0ac7b8d17d 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -310,7 +310,6 @@ RingAccount::newIncomingCall(const std::string& from, const std::map<std::string
auto call_it = pendingSipCalls_.begin();
while (call_it != pendingSipCalls_.end()) {
auto call = call_it->call.lock();
- call->updateDetails(details);
if (not call) {
RING_WARN("newIncomingCall: discarding deleted call");
call_it = pendingSipCalls_.erase(call_it);
@@ -319,6 +318,7 @@ RingAccount::newIncomingCall(const std::string& from, const std::map<std::string
call_it->from_cert->issuer->getId().toString() == from)) {
RING_DBG("newIncomingCall: found matching call for %s", from.c_str());
pendingSipCalls_.erase(call_it);
+ call->updateDetails(details);
return call;
} else {
++call_it;
--
GitLab