Fix memory leak in QgsPostgresProvider::createEmptyLayer

nyalldawson · nyalldawson · commit d6cf2e563f46 · 2018-02-26T19:22:11.000+11:00
(cherry-picked from 8ce519)
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3919,13 +3919,12 @@ QgsVectorLayerExporter::ExportError QgsPostgresProvider::createEmptyLayer( const
 
   // use the provider to edit the table
   dsUri.setDataSource( schemaName, tableName, geometryColumn, QString(), primaryKey );
-  QgsPostgresProvider *provider = new QgsPostgresProvider( dsUri.uri( false ) );
+  std::unique_ptr< QgsPostgresProvider > provider = qgis::make_unique< QgsPostgresProvider >( dsUri.uri( false ) );
   if ( !provider->isValid() )
   {
     if ( errorMessage )
       *errorMessage = QObject::tr( "Loading of the layer %1 failed" ).arg( schemaTableName );
 
-    delete provider;
     return QgsVectorLayerExporter::ErrInvalidLayer;
   }
 
@@ -3986,7 +3985,6 @@ QgsVectorLayerExporter::ExportError QgsPostgresProvider::createEmptyLayer( const
         if ( errorMessage )
           *errorMessage = QObject::tr( "Unsupported type for field %1" ).arg( fld.name() );
 
-        delete provider;
         return QgsVectorLayerExporter::ErrAttributeTypeUnsupported;
       }
 
@@ -4006,7 +4004,6 @@ QgsVectorLayerExporter::ExportError QgsPostgresProvider::createEmptyLayer( const
       if ( errorMessage )
         *errorMessage = QObject::tr( "Creation of fields failed" );
 
-      delete provider;
       return QgsVectorLayerExporter::ErrAttributeCreationFailed;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3919,13 +3919,12 @@ QgsVectorLayerExporter::ExportError QgsPostgresProvider::createEmptyLayer( const`
`3919`	`3919`
`3920`	`3920`	`// use the provider to edit the table`
`3921`	`3921`	`dsUri.setDataSource( schemaName, tableName, geometryColumn, QString(), primaryKey );`
`3922`		`- QgsPostgresProvider *provider = new QgsPostgresProvider( dsUri.uri( false ) );`
	`3922`	`+ std::unique_ptr< QgsPostgresProvider > provider = qgis::make_unique< QgsPostgresProvider >( dsUri.uri( false ) );`
`3923`	`3923`	`if ( !provider->isValid() )`
`3924`	`3924`	`{`
`3925`	`3925`	`if ( errorMessage )`
`3926`	`3926`	`*errorMessage = QObject::tr( "Loading of the layer %1 failed" ).arg( schemaTableName );`
`3927`	`3927`
`3928`		`- delete provider;`
`3929`	`3928`	`return QgsVectorLayerExporter::ErrInvalidLayer;`
`3930`	`3929`	`}`
`3931`	`3930`
`@@ -3986,7 +3985,6 @@ QgsVectorLayerExporter::ExportError QgsPostgresProvider::createEmptyLayer( const`
`3986`	`3985`	`if ( errorMessage )`
`3987`	`3986`	`*errorMessage = QObject::tr( "Unsupported type for field %1" ).arg( fld.name() );`
`3988`	`3987`
`3989`		`- delete provider;`
`3990`	`3988`	`return QgsVectorLayerExporter::ErrAttributeTypeUnsupported;`
`3991`	`3989`	`}`
`3992`	`3990`
`@@ -4006,7 +4004,6 @@ QgsVectorLayerExporter::ExportError QgsPostgresProvider::createEmptyLayer( const`
`4006`	`4004`	`if ( errorMessage )`
`4007`	`4005`	`*errorMessage = QObject::tr( "Creation of fields failed" );`
`4008`	`4006`
`4009`		`- delete provider;`
`4010`	`4007`	`return QgsVectorLayerExporter::ErrAttributeCreationFailed;`
`4011`	`4008`	`}`
`4012`	`4009`