Merge pull request #26 from monich/leaks

Fix memory leaks
sailfishos · Sep 23, 2014 · 3360a7b · 3360a7b
2 parents d07f52c + 747605d
commit 3360a7b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/dbmanager.cpp b/src/dbmanager.cpp
@@ -405,7 +405,7 @@ int DbManager::createCallbackEntry(int key,
 
     This method returns a key of the created transfer or -1 on failure.
 */
-int DbManager::createTransferEntry(MediaItem *mediaItem)
+int DbManager::createTransferEntry(const MediaItem *mediaItem)
 {
     Q_D(DbManager);
     QSqlQuery query;

diff --git a/src/dbmanager.h b/src/dbmanager.h
@@ -51,7 +51,7 @@ class DbManager
                             const QString &cancelMethod,
                             const QString &restartMethod);
 
-    int createTransferEntry(MediaItem *mediaItem);
+    int createTransferEntry(const MediaItem *mediaItem);
 
     bool updateTransferStatus(int key, TransferEngineData::TransferStatus status);
 

diff --git a/src/transferengine.cpp b/src/transferengine.cpp
@@ -236,10 +236,8 @@ void TransferEnginePrivate::enabledPluginsCheck()
             if (info->ready()) {
                 if (info->info().count() > 0) {
                     m_enabledPlugins << info->info();
-                } else {
-                    // Plugin has nothing to provide, just ignore it
-                    delete info;
                 }
+                delete info;
             } else {
                 // These object will be cleaned in pluginInfoReady() slot.
                 m_infoObjects << info;
@@ -1020,6 +1018,8 @@ int TransferEngine::createSync(const QString &displayName,
     mediaItem->setValue(MediaItem::RestartSupported,!restartMethod.isEmpty());
 
     const int key = DbManager::instance()->createTransferEntry(mediaItem);
+    delete mediaItem;
+
     Q_D(TransferEngine);
     d->m_activityMonitor->newActivity(key);
     d->m_keyTypeCache.insert(key, TransferEngineData::Sync);