Guard vector file writer against invalid layers

elpaso · elpaso · commit 911c3182e8db · 2019-04-16T11:27:47.000Z
instead of crashing. Fixes #21856 Funded by: QCooperative.net
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -2473,7 +2473,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
`@@ -2473,7 +2473,7 @@ QgsVectorFileWriter::SaveVectorOptions::SaveVectorOptions()`
`2473`	`2473`
`2474`	`2474`	`QgsVectorFileWriter::WriterError QgsVectorFileWriter::prepareWriteAsVectorFormat( QgsVectorLayer *layer, const QgsVectorFileWriter::SaveVectorOptions &options, QgsVectorFileWriter::PreparedWriterDetails &details )`
`2475`	`2475`	`{`
`2476`		`- if ( !layer )`
	`2476`	`+ if ( !layer \|\| !layer->isValid() )`
`2477`	`2477`	`{`
`2478`	`2478`	`return ErrInvalidLayer;`
`2479`	`2479`	`}`