[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:29:40 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c2349ba

The following commit has been merged in the master branch:
commit c2349bacd766ff293bd1212ed7eba8673e9a847e
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu May 5 17:45:49 2016 +0200

    Make sure we don't eat all system memory
    
    I had wrong configuration files, the encription algorithm definitely
    doesn't take it into account.
---
 core/device.cpp         | 1 +
 core/networkpackage.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/device.cpp b/core/device.cpp
index e4d584e..3c60952 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -57,6 +57,7 @@ Device::Device(QObject* parent, const QString& id)
     m_deviceName = info.deviceName;
     m_deviceType = str2type(info.deviceType);
     m_publicKey = QCA::RSAPublicKey::fromPEM(info.publicKey);
+    Q_ASSERT(m_publicKey.maximumEncryptSize(NetworkPackage::EncryptionAlgorithm)>0);
 
     m_pairingTimeut.setSingleShot(true);
     m_pairingTimeut.setInterval(30 * 1000);  //30 seconds of timeout
diff --git a/core/networkpackage.cpp b/core/networkpackage.cpp
index d521b4a..3d434f9 100644
--- a/core/networkpackage.cpp
+++ b/core/networkpackage.cpp
@@ -166,6 +166,7 @@ void NetworkPackage::encrypt(QCA::PublicKey& key)
     QByteArray serialized = serialize();
 
     int chunkSize = key.maximumEncryptSize(NetworkPackage::EncryptionAlgorithm);
+    Q_ASSERT(chunkSize>0);
 
     QStringList chunks;
     while (!serialized.isEmpty()) {

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list