Prevent crash on export as shapefile if coor transform is uninitialised

timlinux · timlinux · commit b4937cb8cae7 · 2008-10-06T13:33:45.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@9438 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -299,7 +299,7 @@ QgsVectorFileWriter::writeAsShapefile( QgsVectorLayer* layer,
 {
 
   const QgsCoordinateReferenceSystem* outputCRS;
-  QgsCoordinateTransform* ct;
+  QgsCoordinateTransform* ct = 0;
 
   QgsVectorDataProvider* provider = layer->dataProvider();
   int shallTransform = false;
@@ -322,10 +322,6 @@ QgsVectorFileWriter::writeAsShapefile( QgsVectorLayer* layer,
   WriterError err = writer->hasError();
   if ( err != NoError )
   {
-    if ( ct != NULL )
-    {
-      delete ct;
-    }
     delete writer;
     return err;
   }

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ QgsVectorFileWriter::writeAsShapefile( QgsVectorLayer* layer,`
`299`	`299`	`{`
`300`	`300`
`301`	`301`	`const QgsCoordinateReferenceSystem* outputCRS;`
`302`		`- QgsCoordinateTransform* ct;`
	`302`	`+ QgsCoordinateTransform* ct = 0;`
`303`	`303`
`304`	`304`	`QgsVectorDataProvider* provider = layer->dataProvider();`
`305`	`305`	`int shallTransform = false;`
`@@ -322,10 +322,6 @@ QgsVectorFileWriter::writeAsShapefile( QgsVectorLayer* layer,`
`322`	`322`	`WriterError err = writer->hasError();`
`323`	`323`	`if ( err != NoError )`
`324`	`324`	`{`
`325`		`- if ( ct != NULL )`
`326`		`- {`
`327`		`- delete ct;`
`328`		`- }`
`329`	`325`	`delete writer;`
`330`	`326`	`return err;`
`331`	`327`	`}`