Guard vector file writer against invalid layers

elpaso · elpaso · commit 0415c61914d4 · 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
@@ -2453,7 +2453,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
`@@ -2453,7 +2453,7 @@ QgsVectorFileWriter::SaveVectorOptions::SaveVectorOptions()`
`2453`	`2453`
`2454`	`2454`	`QgsVectorFileWriter::WriterError QgsVectorFileWriter::prepareWriteAsVectorFormat( QgsVectorLayer *layer, const QgsVectorFileWriter::SaveVectorOptions &options, QgsVectorFileWriter::PreparedWriterDetails &details )`
`2455`	`2455`	`{`
`2456`		`- if ( !layer )`
	`2456`	`+ if ( !layer \|\| !layer->isValid() )`
`2457`	`2457`	`{`
`2458`	`2458`	`return ErrInvalidLayer;`
`2459`	`2459`	`}`