[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=44c0ec1
The following commit has been merged in the master branch:
commit 44c0ec1c781f91a1843bb1f6e03268f6e2549ae6
Author: Vineet Garg <grgvineet at gmail.com>
Date: Mon Aug 17 20:04:41 2015 +0530
If remote device certificate is changes, in sslError due to simulataneous multiple connections, unpair was called on null pointer
---
core/backends/lan/lanlinkprovider.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 2076326..5d015d3 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -274,11 +274,15 @@ void LanLinkProvider::sslErrors(const QList<QSslError>& errors)
case QSslError::CertificateNotYetValid:
case QSslError::CertificateExpired:
case QSslError::CertificateUntrusted:
- case QSslError::SelfSignedCertificate:
+ case QSslError::SelfSignedCertificate: {
qCDebug(KDECONNECT_CORE) << "Unpairing device due to " << error.errorString();
- // Not able to find an alternative now
- Daemon::instance()->getDevice(socket->peerVerifyName())->unpair();
+ /* Due to simultaneous multiple connections, it may be possible that device instance does not exist */
+ Device *device = Daemon::instance()->getDevice(socket->peerVerifyName());
+ if (device != Q_NULLPTR) {
+ device->unpair();
+ }
break;
+ }
default:
continue;
// Lots of warnings without this
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list