Add todo regarding PartitionManagerPrivate leaking

sailfishos · Nov 28, 2018 · 7b6a8ed · 7b6a8ed
1 parent 5f315b1
commit 7b6a8ed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/partitionmanager_p.h b/src/partitionmanager_p.h
@@ -90,6 +90,7 @@ class PartitionManagerPrivate : public QObject, public QSharedData
     void formatError(Partition::Error error);
 
 private:
+    // TODO: This is leaking (Disks2::Monitor is never free'ed).
     static PartitionManagerPrivate *sharedInstance;
 
     Partitions m_partitions;

diff --git a/src/udisks2blockdevices.cpp b/src/udisks2blockdevices.cpp
@@ -42,11 +42,11 @@
 
 using namespace UDisks2;
 
-BlockDevices *BlockDevices::sharedInstance = nullptr;
+QPointer<BlockDevices> BlockDevices::sharedInstance = nullptr;
 
 BlockDevices *BlockDevices::instance()
 {
-    return sharedInstance ? sharedInstance : new BlockDevices;
+    return sharedInstance ? sharedInstance.data() : new BlockDevices;
 }
 
 BlockDevices::~BlockDevices()

diff --git a/src/udisks2blockdevices_p.h b/src/udisks2blockdevices_p.h
@@ -33,6 +33,8 @@
 #define UDISKS2_BLOCK_DEVICES_H
 
 #include <QMap>
+#include <QPointer>
+
 #include "udisks2block_p.h"
 
 class QTimerEvent;
@@ -98,7 +100,7 @@ private slots:
     QMap<QString, Block *> m_blockDevices;
     QMap<QString, PartitionWaiter*> m_partitionWaits;
 
-    static BlockDevices *sharedInstance;
+    static QPointer<BlockDevices> sharedInstance;
 };
 
 }

diff --git a/src/udisks2monitor.cpp b/src/udisks2monitor.cpp
@@ -132,6 +132,9 @@ UDisks2::Monitor::~Monitor()
     sharedInstance = nullptr;
     qDeleteAll(m_jobsToWait);
     m_jobsToWait.clear();
+
+    delete m_blockDevices;
+    m_blockDevices = nullptr;
 }
 
 // TODO : Move lock, unlock, mount, unmount, format inside udisks2block.cpp