Merge pull request #9790 from elpaso/bugfix-21856-vectorfilewriter-crash

elpaso · web-flow · commit 7ae29e1f3186 · 2019-04-17T08:21:14.000+02:00
Guard vector file writer against invalid layers
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -2557,7 +2557,7 @@ QgsVectorFileWriter::SaveVectorOptions::SaveVectorOptions()
 
 QgsVectorFileWriter::WriterError QgsVectorFileWriter::prepareWriteAsVectorFormat( QgsVectorLayer *layer, const QgsVectorFileWriter::SaveVectorOptions &options, QgsVectorFileWriter::PreparedWriterDetails &details )
 {
-  if ( !layer )
+  if ( !layer || !layer->isValid() )
   {
     return ErrInvalidLayer;
   }

Original file line number	Diff line number	Diff line change
`@@ -2557,7 +2557,7 @@ QgsVectorFileWriter::SaveVectorOptions::SaveVectorOptions()`
`2557`	`2557`
`2558`	`2558`	`QgsVectorFileWriter::WriterError QgsVectorFileWriter::prepareWriteAsVectorFormat( QgsVectorLayer *layer, const QgsVectorFileWriter::SaveVectorOptions &options, QgsVectorFileWriter::PreparedWriterDetails &details )`
`2559`	`2559`	`{`
`2560`		`- if ( !layer )`
	`2560`	`+ if ( !layer \|\| !layer->isValid() )`
`2561`	`2561`	`{`
`2562`	`2562`	`return ErrInvalidLayer;`
`2563`	`2563`	`}`