Guard vector file writer against invalid layers

elpaso · elpaso · commit e8a7d0e97905 · 2019-04-16T13:27:47.000+02:00
instead of crashing. Fixes #21856 Funded by: QCooperative.net
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -2559,7 +2559,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
`@@ -2559,7 +2559,7 @@ QgsVectorFileWriter::SaveVectorOptions::SaveVectorOptions()`
`2559`	`2559`
`2560`	`2560`	`QgsVectorFileWriter::WriterError QgsVectorFileWriter::prepareWriteAsVectorFormat( QgsVectorLayer *layer, const QgsVectorFileWriter::SaveVectorOptions &options, QgsVectorFileWriter::PreparedWriterDetails &details )`
`2561`	`2561`	`{`
`2562`		`- if ( !layer )`
	`2562`	`+ if ( !layer \|\| !layer->isValid() )`
`2563`	`2563`	`{`
`2564`	`2564`	`return ErrInvalidLayer;`
`2565`	`2565`	`}`