Fix QgsVectorLayer::hasFeatures() crash when editable

m-kuhn · m-kuhn · commit 48a796dc9c7a · 2018-06-04T08:59:34.000+02:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2767,8 +2767,8 @@ long QgsVectorLayer::featureCount() const
 
 QgsFeatureSource::FeatureAvailability QgsVectorLayer::hasFeatures() const
 {
-  const QgsFeatureIds deletedFeatures = mEditBuffer->deletedFeatureIds();
-  const QgsFeatureMap addedFeatures = mEditBuffer->addedFeatures();
+  const QgsFeatureIds deletedFeatures( mEditBuffer ? mEditBuffer->deletedFeatureIds() : QgsFeatureIds() );
+  const QgsFeatureMap addedFeatures( mEditBuffer ? mEditBuffer->addedFeatures() : QgsFeatureMap() );
 
   if ( mEditBuffer && !deletedFeatures.empty() )
   {

Original file line number	Diff line number	Diff line change
`@@ -2767,8 +2767,8 @@ long QgsVectorLayer::featureCount() const`
`2767`	`2767`
`2768`	`2768`	`QgsFeatureSource::FeatureAvailability QgsVectorLayer::hasFeatures() const`
`2769`	`2769`	`{`
`2770`		`- const QgsFeatureIds deletedFeatures = mEditBuffer->deletedFeatureIds();`
`2771`		`- const QgsFeatureMap addedFeatures = mEditBuffer->addedFeatures();`
	`2770`	`+ const QgsFeatureIds deletedFeatures( mEditBuffer ? mEditBuffer->deletedFeatureIds() : QgsFeatureIds() );`
	`2771`	`+ const QgsFeatureMap addedFeatures( mEditBuffer ? mEditBuffer->addedFeatures() : QgsFeatureMap() );`
`2772`	`2772`
`2773`	`2773`	`if ( mEditBuffer && !deletedFeatures.empty() )`
`2774`	`2774`	`{`