vector file writer: avoid duplicate destruction of coordinate transform in case of exceptions (fixes #9993)

jef-n · jef-n · commit cc4fc5a01f55 · 2014-10-26T16:47:54.000+01:00
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1927,7 +1927,6 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
     {
       QgsVectorFileWriter::WriterError error = writer->exportFeaturesSymbolLevels( layer, fit, ct, errorMessage );
       delete writer;
-      delete ct;
       return ( error == NoError ) ? NoError : ErrFeatureWriteFailed;
     }
   }
@@ -1969,7 +1968,6 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
       }
       catch ( QgsCsException &e )
       {
-        delete ct;
         delete writer;
 
         QString msg = QObject::tr( "Failed to transform a point while drawing a feature with ID '%1'. Writing stopped. (Exception: %2)" )
@@ -2471,8 +2469,6 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
       }
       catch ( QgsCsException &e )
       {
-        delete ct;
-
         QString msg = QObject::tr( "Failed to transform, writing stopped. (Exception: %1)" )
                       .arg( e.what() );
         QgsLogger::warning( msg );

Original file line number	Diff line number	Diff line change
`@@ -1927,7 +1927,6 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe`
`1927`	`1927`	`{`
`1928`	`1928`	`QgsVectorFileWriter::WriterError error = writer->exportFeaturesSymbolLevels( layer, fit, ct, errorMessage );`
`1929`	`1929`	`delete writer;`
`1930`		`- delete ct;`
`1931`	`1930`	`return ( error == NoError ) ? NoError : ErrFeatureWriteFailed;`
`1932`	`1931`	`}`
`1933`	`1932`	`}`
`@@ -1969,7 +1968,6 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe`
`1969`	`1968`	`}`
`1970`	`1969`	`catch ( QgsCsException &e )`
`1971`	`1970`	`{`
`1972`		`- delete ct;`
`1973`	`1971`	`delete writer;`
`1974`	`1972`
`1975`	`1973`	`QString msg = QObject::tr( "Failed to transform a point while drawing a feature with ID '%1'. Writing stopped. (Exception: %2)" )`
`@@ -2471,8 +2469,6 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels`
`2471`	`2469`	`}`
`2472`	`2470`	`catch ( QgsCsException &e )`
`2473`	`2471`	`{`
`2474`		`- delete ct;`
`2475`		`-`
`2476`	`2472`	`QString msg = QObject::tr( "Failed to transform, writing stopped. (Exception: %1)" )`
`2477`	`2473`	`.arg( e.what() );`
`2478`	`2474`	`QgsLogger::warning( msg );`