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

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


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

The following commit has been merged in the master branch:
commit e86ea7b3bde7af3d4415299afbf1fa467ed311c5
Author: David Kahles <david.kahles96 at gmail.com>
Date:   Thu Mar 31 23:37:35 2016 +0200

    Remove the keys from the notification hashmap
    
    When disabling the notifications plugin, we can't delete the notification
    adapter due to a QT bug. Thus we leak it, and to not expose the notifications
    anymore, we clean up the notifications in the adaptor. Therefore we delete
    the QStrings in the notification hashmap (mNotifications) with qDeleteAll().
    But this function does only free the QStrings, but no remove the keys from the
    hashmap. Thus, a subsequent call to activeNotifications() has an undefined
    behavior, as there are dangling pointers in the hashmap. This is solved by
    removing the keys from the hashmap.
    
    REVIEW: 127543
---
 plugins/notifications/notificationsdbusinterface.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins/notifications/notificationsdbusinterface.cpp
index 4e2c7e0..2e9132b 100644
--- a/plugins/notifications/notificationsdbusinterface.cpp
+++ b/plugins/notifications/notificationsdbusinterface.cpp
@@ -51,6 +51,7 @@ NotificationsDbusInterface::~NotificationsDbusInterface()
 void NotificationsDbusInterface::clearNotifications()
 {
     qDeleteAll(mNotifications);
+    mNotifications.clear();
 }
 
 QStringList NotificationsDbusInterface::activeNotifications()

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list