Fix memory leaks

qgis · Oct 30, 2017 · 7843d22bded05d738a641f5b19dec3aa562f143a · 7843d22
1 parent 7c5811c
commit 7843d22bded05d738a641f5b19dec3aa562f143a
Unified Split

Showing with 2 additions and 4 deletions.

+1 −2 src/app/main.cpp

+1 −2 src/app/qgisapp.cpp
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -859,12 +859,11 @@ int main( int argc, char *argv[] )
   // Settings migration is only supported on the default profile for now.
   if ( profileName == "default" )
   {
-    QgsVersionMigration *migration = QgsVersionMigration::canMigrate( 20000, Qgis::QGIS_VERSION_INT );
+    std::unique_ptr< QgsVersionMigration > migration( QgsVersionMigration::canMigrate( 20000, Qgis::QGIS_VERSION_INT ) );
     if ( migration && ( mySettingsMigrationForce || migration->requiresMigration() ) )
     {
       QgsDebugMsg( "RUNNING MIGRATION" );
       migration->runMigration();
-      delete migration;
     }
   }
 

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1358,10 +1358,9 @@ QgisApp::~QgisApp()
   QgsApplication::setFileOpenEventReceiver( nullptr );
 
   delete mPythonUtils;
-
   delete mTray;
-
   delete mDataSourceManagerDialog;
+  qDeleteAll( mCustomDropHandlers );
 
   // This function *MUST* be the last one called, as it destroys in
   // particular GDAL. As above objects can hold GDAL/OGR objects, it is not