From 14302ddbac1e6d9c95de15c97362c3de09f545eb Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 7 Oct 2016 16:20:20 +0900
Subject: Fixed massive leaks of Event objects

---
 jobs/syncjob.cpp |  2 +-
 jobs/syncjob.h   | 37 +++++++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'jobs')

diff --git a/jobs/syncjob.cpp b/jobs/syncjob.cpp
index 2b2705b1..59c40785 100644
--- a/jobs/syncjob.cpp
+++ b/jobs/syncjob.cpp
@@ -83,7 +83,7 @@ QString SyncJob::nextBatch() const
     return d->nextBatch;
 }
 
-const SyncData& SyncJob::roomData() const
+SyncData& SyncJob::roomData()
 {
     return d->roomData;
 }
diff --git a/jobs/syncjob.h b/jobs/syncjob.h
index ed99b38b..55d7458c 100644
--- a/jobs/syncjob.h
+++ b/jobs/syncjob.h
@@ -26,10 +26,34 @@
 
 namespace QMatrixClient
 {
+    /**
+     * @brief A crude wrapper around a container of pointers that owns pointers
+     * to contained objects
+     *
+     * Similar to vector<unique_ptr<>>, upon deletion, EventsHolder
+     * will delete all events contained in it.
+     */
+    template <typename ContainerT>
+    class Owning : public ContainerT
+    {
+        public:
+            Owning() = default;
+            Owning(Owning&) = delete;
+            Owning(Owning&& other) : ContainerT(std::move(other)) { }
+            ~Owning() { for (auto e: *this) delete e; }
+
+            /**
+             * @brief returns the underlying events and releases the ownership
+             *
+             * Acts similar to unique_ptr::release.
+             */
+            ContainerT release() { return std::move(*this); }
+    };
+
     class SyncRoomData
     {
     public:
-        class EventList : public Events
+        class EventList : public Owning<Events>
         {
             private:
                 QString jsonKey;
@@ -55,7 +79,13 @@ namespace QMatrixClient
                      JoinState joinState_ = JoinState::Join,
                      const QJsonObject& room_ = QJsonObject());
     };
-    using SyncData = QVector<SyncRoomData>;
+}
+Q_DECLARE_TYPEINFO(QMatrixClient::SyncRoomData, Q_MOVABLE_TYPE);
+
+namespace QMatrixClient
+{
+    // QVector cannot work with non-copiable objects, std::vector can.
+    using SyncData = std::vector<SyncRoomData>;
 
     class ConnectionData;
     class SyncJob: public BaseJob
@@ -69,7 +99,7 @@ namespace QMatrixClient
             void setPresence(QString presence);
             void setTimeout(int timeout);
 
-            const SyncData& roomData() const;
+            SyncData& roomData();
             QString nextBatch() const;
 
         protected:
@@ -82,6 +112,5 @@ namespace QMatrixClient
             Private* d;
     };
 }
-Q_DECLARE_TYPEINFO(QMatrixClient::SyncRoomData, Q_MOVABLE_TYPE);
 
 #endif // QMATRIXCLIENT_SYNCJOB_H
-- 
cgit v1.2.3